Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86fa2408 authored by Bilal Amarni's avatar Bilal Amarni Committed by Greg Kroah-Hartman
Browse files

security/keys: add CONFIG_KEYS_COMPAT to Kconfig 



commit 47b2c3fff4932e6fc17ce13d51a43c6969714e20 upstream.

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: default avatarBilal Amarni <bilal.amarni@gmail.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
cc: Eric Biggers <ebiggers3@gmail.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
Cc: James Cowgill <james.cowgill@mips.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb36c7de

arch/powerpc/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -1070,11 +1070,6 @@ source "arch/powerpc/Kconfig.debug" 


source "security/Kconfig"



config KEYS_COMPAT

	bool

	depends on COMPAT && KEYS

	default y



source "crypto/Kconfig"



config PPC_LIB_RHEAP

arch/s390/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -332,9 +332,6 @@ config COMPAT 
config SYSVIPC_COMPAT

	def_bool y if COMPAT && SYSVIPC



config KEYS_COMPAT

	def_bool y if COMPAT && KEYS



config SMP

	def_bool y

	prompt "Symmetric multi-processing support"

arch/sparc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -542,9 +542,6 @@ config SYSVIPC_COMPAT 
	depends on COMPAT && SYSVIPC

	default y



config KEYS_COMPAT

	def_bool y if COMPAT && KEYS



endmenu



source "net/Kconfig"

arch/x86/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -2471,10 +2471,6 @@ config COMPAT_FOR_U64_ALIGNMENT 
config SYSVIPC_COMPAT

	def_bool y

	depends on SYSVIPC



config KEYS_COMPAT

	def_bool y

	depends on KEYS

endif



endmenu

security/keys/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -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