From: Bilal Amarni <bilal.amarni@gmail.com> To: fengguang.wu@intel.com Cc: arnd@arndb.de, bilal.amarni@gmail.com, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig Date: Thu, 26 Jan 2017 14:27:23 +0100 [thread overview] Message-ID: <1485437243-9349-1-git-send-email-bilal.amarni@gmail.com> (raw) In-Reply-To: <201701262036.mMS7eB5U%fengguang.wu@intel.com> CONFIG_KEYS_COMPAT is defined in arch-specific Kconfigs and is missing for several 64-bit architectures : arm64, 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. Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com> --- arch/powerpc/Kconfig | 5 ----- arch/s390/Kconfig | 3 --- arch/sparc/Kconfig | 3 --- arch/x86/Kconfig | 4 ---- security/keys/Kconfig | 4 ++++ 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a8ee573..5947ea2 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1128,11 +1128,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 diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index c6722112..633f553 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -362,9 +362,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" diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index cf4034c..2b07f0a 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -571,9 +571,6 @@ config SYSVIPC_COMPAT depends on COMPAT && SYSVIPC default y -config KEYS_COMPAT - def_bool y if COMPAT && KEYS - endmenu source "net/Kconfig" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e487493..f93b6ba 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2768,10 +2768,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 diff --git a/security/keys/Kconfig b/security/keys/Kconfig index d942c7c..f44d8be 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 -- 2.7.2
WARNING: multiple messages have this Message-ID (diff)
From: bilal.amarni@gmail.com (Bilal Amarni) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig Date: Thu, 26 Jan 2017 14:27:23 +0100 [thread overview] Message-ID: <1485437243-9349-1-git-send-email-bilal.amarni@gmail.com> (raw) In-Reply-To: <201701262036.mMS7eB5U%fengguang.wu@intel.com> CONFIG_KEYS_COMPAT is defined in arch-specific Kconfigs and is missing for several 64-bit architectures : arm64, 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. Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com> --- arch/powerpc/Kconfig | 5 ----- arch/s390/Kconfig | 3 --- arch/sparc/Kconfig | 3 --- arch/x86/Kconfig | 4 ---- security/keys/Kconfig | 4 ++++ 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a8ee573..5947ea2 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1128,11 +1128,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 diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index c6722112..633f553 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -362,9 +362,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" diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index cf4034c..2b07f0a 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -571,9 +571,6 @@ config SYSVIPC_COMPAT depends on COMPAT && SYSVIPC default y -config KEYS_COMPAT - def_bool y if COMPAT && KEYS - endmenu source "net/Kconfig" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e487493..f93b6ba 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2768,10 +2768,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 diff --git a/security/keys/Kconfig b/security/keys/Kconfig index d942c7c..f44d8be 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 -- 2.7.2
next prev parent reply other threads:[~2017-01-26 13:27 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-23 17:03 [PATCH] ARM64: enable CONFIG_KEYS_COMPAT in Kconfig Bilal Amarni 2017-01-23 17:03 ` Bilal Amarni 2017-01-25 21:22 ` Arnd Bergmann 2017-01-25 21:22 ` Arnd Bergmann 2017-01-26 11:49 ` [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig Bilal Amarni 2017-01-26 11:49 ` Bilal Amarni 2017-01-26 12:55 ` kbuild test robot 2017-01-26 12:55 ` kbuild test robot 2017-01-26 13:27 ` Bilal Amarni [this message] 2017-01-26 13:27 ` Bilal Amarni 2017-02-08 13:01 ` Bilal Amarni 2017-02-08 13:01 ` Bilal Amarni 2017-02-08 13:25 ` Arnd Bergmann 2017-02-08 13:25 ` Arnd Bergmann 2017-02-09 21:11 Bilal Amarni 2017-02-10 8:15 ` Arnd Bergmann 2017-02-10 11:04 ` David Howells
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1485437243-9349-1-git-send-email-bilal.amarni@gmail.com \ --to=bilal.amarni@gmail.com \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=fengguang.wu@intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.