summaryrefslogtreecommitdiffstats
path: root/security/keys/compat.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-06-10 14:52:10 +0200
committerJames Morris <james.l.morris@oracle.com>2012-06-10 14:52:10 +0200
commit66dd07b88a1c9d446f32253da606b87324fa620e (patch)
tree4e0971bdd543585c7ab46716ae808a7fd82f9c35 /security/keys/compat.c
parentMerge branches 'next-queue' and 'next' into next (diff)
parentLinux 3.5-rc2 (diff)
downloadlinux-66dd07b88a1c9d446f32253da606b87324fa620e.tar.xz
linux-66dd07b88a1c9d446f32253da606b87324fa620e.zip
Merge commit 'v3.5-rc2' into next
Diffstat (limited to 'security/keys/compat.c')
-rw-r--r--security/keys/compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/compat.c b/security/keys/compat.c
index e35ae1d208a8..1c261763f479 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -38,7 +38,7 @@ static long compat_keyctl_instantiate_key_iov(
ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc,
ARRAY_SIZE(iovstack),
- iovstack, &iov, 1);
+ iovstack, &iov);
if (ret < 0)
return ret;
if (ret == 0)