summaryrefslogtreecommitdiff
path: root/security/keys/compat.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-11-16 05:39:48 +0400
committerJames Morris <jmorris@namei.org>2011-11-16 05:39:48 +0400
commit24942c8e5cc8696064ee207ff29d4cf21f70dafc (patch)
tree08a8221eb72ec3da7746d7d76f6f5915ce77cde7 /security/keys/compat.c
parente163bc8e4a0cd1cdffadb58253f7651201722d56 (diff)
parentff0ff78068dd8a962358dbbdafa9d6f24540d3e5 (diff)
downloadlinux-24942c8e5cc8696064ee207ff29d4cf21f70dafc.tar.xz
Merge branch 'master'; commit 'v3.2-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 338b510e9027..4c48e13448f8 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -38,7 +38,7 @@ long compat_keyctl_instantiate_key_iov(
ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc,
ARRAY_SIZE(iovstack),
- iovstack, &iov);
+ iovstack, &iov, 1);
if (ret < 0)
return ret;
if (ret == 0)