summaryrefslogtreecommitdiffstats
path: root/security/keys/compat.c
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-10-10 01:04:43 +0200
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>2019-12-12 22:41:17 +0100
commit601f0093f2647db67be40b62e13cd0660990a7c8 (patch)
treedbb20f2a4524bc96ce1ccaa074819cadd092a1fe /security/keys/compat.c
parentMerge tag 'ceph-for-5.5-rc2' of git://github.com/ceph/ceph-client (diff)
downloadlinux-601f0093f2647db67be40b62e13cd0660990a7c8.tar.xz
linux-601f0093f2647db67be40b62e13cd0660990a7c8.zip
KEYS: remove CONFIG_KEYS_COMPAT
KEYS_COMPAT now always takes the value of COMPAT && KEYS. But the security/keys/ directory is only compiled if KEYS is enabled, so in practice KEYS_COMPAT is the same as COMPAT. Therefore, remove the unnecessary KEYS_COMPAT and just use COMPAT directly. (Also remove an outdated comment from compat.c.) Reviewed-by: James Morris <jamorris@linux.microsoft.com> Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'security/keys/compat.c')
-rw-r--r--security/keys/compat.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/security/keys/compat.c b/security/keys/compat.c
index 9bcc404131aa..b975f8f11124 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -46,11 +46,6 @@ static long compat_keyctl_instantiate_key_iov(
/*
* The key control system call, 32-bit compatibility version for 64-bit archs
- *
- * This should only be called if the 64-bit arch uses weird pointers in 32-bit
- * mode or doesn't guarantee that the top 32-bits of the argument registers on
- * taking a 32-bit syscall are zero. If you can, you should call sys_keyctl()
- * directly.
*/
COMPAT_SYSCALL_DEFINE5(keyctl, u32, option,
u32, arg2, u32, arg3, u32, arg4, u32, arg5)