diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /security/keys/compat.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'security/keys/compat.c')
-rw-r--r-- | security/keys/compat.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/security/keys/compat.c b/security/keys/compat.c index 1c261763f47..338b510e902 100644 --- a/security/keys/compat.c +++ b/security/keys/compat.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * | 24 | * |
25 | * If successful, 0 will be returned. | 25 | * If successful, 0 will be returned. |
26 | */ | 26 | */ |
27 | static long compat_keyctl_instantiate_key_iov( | 27 | long compat_keyctl_instantiate_key_iov( |
28 | key_serial_t id, | 28 | key_serial_t id, |
29 | const struct compat_iovec __user *_payload_iov, | 29 | const struct compat_iovec __user *_payload_iov, |
30 | unsigned ioc, | 30 | unsigned ioc, |
@@ -33,7 +33,7 @@ static long compat_keyctl_instantiate_key_iov( | |||
33 | struct iovec iovstack[UIO_FASTIOV], *iov = iovstack; | 33 | struct iovec iovstack[UIO_FASTIOV], *iov = iovstack; |
34 | long ret; | 34 | long ret; |
35 | 35 | ||
36 | if (!_payload_iov || !ioc) | 36 | if (_payload_iov == 0 || ioc == 0) |
37 | goto no_payload; | 37 | goto no_payload; |
38 | 38 | ||
39 | ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc, | 39 | ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc, |
@@ -135,9 +135,6 @@ asmlinkage long compat_sys_keyctl(u32 option, | |||
135 | return compat_keyctl_instantiate_key_iov( | 135 | return compat_keyctl_instantiate_key_iov( |
136 | arg2, compat_ptr(arg3), arg4, arg5); | 136 | arg2, compat_ptr(arg3), arg4, arg5); |
137 | 137 | ||
138 | case KEYCTL_INVALIDATE: | ||
139 | return keyctl_invalidate_key(arg2); | ||
140 | |||
141 | default: | 138 | default: |
142 | return -EOPNOTSUPP; | 139 | return -EOPNOTSUPP; |
143 | } | 140 | } |