linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bilal Amarni <bilal.amarni@gmail.com>
To: dhowells@redhat.com
Cc: arnd@arndb.de, james.l.morris@oracle.com, serge@hallyn.com,
	keyrings@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-security-module@vger.kernel.org,
	Bilal Amarni <bilal.amarni@gmail.com>
Subject: [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig
Date: Thu,  9 Feb 2017 22:11:38 +0100	[thread overview]
Message-ID: <1486674698-67190-1-git-send-email-bilal.amarni@gmail.com> (raw)

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

             reply	other threads:[~2017-02-09 22:27 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-09 21:11 Bilal Amarni [this message]
2017-02-10  8:15 ` [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig Arnd Bergmann
2017-02-10 11:04 ` David Howells
2017-03-29 19:20 ` Eric Biggers
2017-06-03  2:43   ` Eric Biggers
2017-06-03  8:04   ` David Howells
2017-06-05  3:34     ` Eric Biggers
  -- strict thread matches above, loose matches on Subject: below --
2017-01-25 21:22 [PATCH] ARM64: enable CONFIG_KEYS_COMPAT in Kconfig Arnd Bergmann
2017-01-26 11:49 ` [PATCH] security/keys: add CONFIG_KEYS_COMPAT to Kconfig Bilal Amarni
2017-01-26 12:55   ` kbuild test robot
2017-01-26 13:27     ` Bilal Amarni
2017-02-08 13:01       ` Bilal Amarni
2017-02-08 13:25         ` Arnd Bergmann

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=1486674698-67190-1-git-send-email-bilal.amarni@gmail.com \
    --to=bilal.amarni@gmail.com \
    --cc=arnd@arndb.de \
    --cc=dhowells@redhat.com \
    --cc=james.l.morris@oracle.com \
    --cc=keyrings@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=serge@hallyn.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).