Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1577995 > unrolled thread

[PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig

Started byBilal Amarni <bilal.amarni@gmail.com>
First post2017-02-09 23:30 +0100
Last post2017-02-10 12:20 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig Bilal Amarni <bilal.amarni@gmail.com> - 2017-02-09 23:30 +0100
    Re: [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig Arnd Bergmann <arnd@arndb.de> - 2017-02-10 09:20 +0100
    Re: [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig David Howells <dhowells@redhat.com> - 2017-02-10 12:20 +0100

#1577995 — [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig

FromBilal Amarni <bilal.amarni@gmail.com>
Date2017-02-09 23:30 +0100
Subject[PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig
Message-ID<t95nY-3tU-13@gated-at.bofh.it>
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 281f4f1..176e20d 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

[toc] | [next] | [standalone]


#1578267

FromArnd Bergmann <arnd@arndb.de>
Date2017-02-10 09:20 +0100
Message-ID<t9eAW-To-5@gated-at.bofh.it>
In reply to#1577995
On Thu, Feb 9, 2017 at 10:11 PM, Bilal Amarni <bilal.amarni@gmail.com> wrote:
> 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>

Reviewed-by: Arnd Bergmann <arnd@arndb.de>

[toc] | [prev] | [next] | [standalone]


#1578400

FromDavid Howells <dhowells@redhat.com>
Date2017-02-10 12:20 +0100
Message-ID<t9hp7-2HH-5@gated-at.bofh.it>
In reply to#1577995
Bilal Amarni <bilal.amarni@gmail.com> wrote:

> 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>

Applied.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web