diff options
author | Bilal Amarni <bilal.amarni@gmail.com> | 2017-06-08 14:47:26 +0100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2017-06-09 13:29:45 +1000 |
commit | 47b2c3fff4932e6fc17ce13d51a43c6969714e20 (patch) | |
tree | 670368023ad46ae7f0b5c14d41880cf3eef61caf /security | |
parent | aea4156c308670699d74dedb182ebceffb633185 (diff) | |
download | op-kernel-dev-47b2c3fff4932e6fc17ce13d51a43c6969714e20.zip op-kernel-dev-47b2c3fff4932e6fc17ce13d51a43c6969714e20.tar.gz |
security/keys: add CONFIG_KEYS_COMPAT to Kconfig
CONFIG_KEYS_COMPAT is defined in arch-specific Kconfigs and is missing for
several 64-bit architectures : mips, parisc, tile.
At the moment and for those architectures, calling in 32-bit userspace the
keyctl syscall would return an ENOSYS error.
This patch moves the CONFIG_KEYS_COMPAT option to security/keys/Kconfig, to
make sure the compatibility wrapper is registered by default for any 64-bit
architecture as long as it is configured with CONFIG_COMPAT.
[DH: Modified to remove arm64 compat enablement also as requested by Eric
Biggers]
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
cc: Eric Biggers <ebiggers3@gmail.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/keys/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/keys/Kconfig b/security/keys/Kconfig index 6fd95f7..00b7431 100644 --- a/security/keys/Kconfig +++ b/security/keys/Kconfig @@ -20,6 +20,10 @@ config KEYS If you are unsure as to whether this is required, answer N. +config KEYS_COMPAT + def_bool y + depends on COMPAT && KEYS + config PERSISTENT_KEYRINGS bool "Enable register of persistent per-UID keyrings" depends on KEYS |