Merge commit 'v3.5-rc2' into next

[karo-tx-linux.git] / security / keys / compat.c

diff --git a/security/keys/compat.c b/security/keys/compat.c
index c92d42b021aa47c62dea181c6b90129d80ff7e53..1c261763f4799180432f2162a096579007243203 100644 (file)
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -24,7 +24,7 @@
  *
  * If successful, 0 will be returned.
  */
-long compat_keyctl_instantiate_key_iov(
+static long compat_keyctl_instantiate_key_iov(
        key_serial_t id,
        const struct compat_iovec __user *_payload_iov,
        unsigned ioc,
@@ -33,7 +33,7 @@ long compat_keyctl_instantiate_key_iov(
        struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
        long ret;
 
-       if (_payload_iov == 0 || ioc == 0)
+       if (!_payload_iov || !ioc)
                goto no_payload;
 
        ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc,