From: Kees Cook <keescook@chromium.org>
To: James Morris <jmorris@namei.org>
Cc: Kees Cook <keescook@chromium.org>,
Casey Schaufler <casey@schaufler-ca.com>,
John Johansen <john.johansen@canonical.com>,
Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
Paul Moore <paul@paul-moore.com>,
Stephen Smalley <sds@tycho.nsa.gov>,
"Schaufler, Casey" <casey.schaufler@intel.com>,
LSM <linux-security-module@vger.kernel.org>,
Jonathan Corbet <corbet@lwn.net>,
linux-doc@vger.kernel.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH security-next v4 32/32] LSM: Add all exclusive LSMs to ordered initialization
Date: Mon, 1 Oct 2018 17:55:05 -0700 [thread overview]
Message-ID: <20181002005505.6112-33-keescook@chromium.org> (raw)
In-Reply-To: <20181002005505.6112-1-keescook@chromium.org>
This removes CONFIG_DEFAULT_SECURITY in favor of the explicit build-time
ordering offered by CONFIG_LSM_ORDER, and adds all the exclusive LSMs to
the ordered LSM initialization. The old meaning of CONFIG_DEFAULT_SECURITY
is now captured by which exclusive LSM is listed first in the LSM order.
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
---
security/Kconfig | 43 ++++---------------------------------------
security/security.c | 23 +----------------------
2 files changed, 5 insertions(+), 61 deletions(-)
diff --git a/security/Kconfig b/security/Kconfig
index c459d2b4c7bd..cc8bb1c344f5 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -239,43 +239,6 @@ source security/yama/Kconfig
source security/integrity/Kconfig
-choice
- prompt "Default security module"
- default DEFAULT_SECURITY_SELINUX if SECURITY_SELINUX
- default DEFAULT_SECURITY_SMACK if SECURITY_SMACK
- default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO
- default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR
- default DEFAULT_SECURITY_DAC
-
- help
- Select the security module that will be used by default if the
- kernel parameter security= is not specified.
-
- config DEFAULT_SECURITY_SELINUX
- bool "SELinux" if SECURITY_SELINUX=y
-
- config DEFAULT_SECURITY_SMACK
- bool "Simplified Mandatory Access Control" if SECURITY_SMACK=y
-
- config DEFAULT_SECURITY_TOMOYO
- bool "TOMOYO" if SECURITY_TOMOYO=y
-
- config DEFAULT_SECURITY_APPARMOR
- bool "AppArmor" if SECURITY_APPARMOR=y
-
- config DEFAULT_SECURITY_DAC
- bool "Unix Discretionary Access Controls"
-
-endchoice
-
-config DEFAULT_SECURITY
- string
- default "selinux" if DEFAULT_SECURITY_SELINUX
- default "smack" if DEFAULT_SECURITY_SMACK
- default "tomoyo" if DEFAULT_SECURITY_TOMOYO
- default "apparmor" if DEFAULT_SECURITY_APPARMOR
- default "" if DEFAULT_SECURITY_DAC
-
config LSM_ENABLE
string "LSMs to enable at boot time"
default "all"
@@ -293,12 +256,14 @@ config LSM_ENABLE
config LSM_ORDER
string "Default initialization order of builtin LSMs"
- default "yama,loadpin,integrity"
+ default "yama,loadpin,integrity,selinux,smack,tomoyo,apparmor"
help
A comma-separated list of LSMs, in initialization order.
Any LSMs left off this list will be link-order initialized
after any listed LSMs. Any LSMs listed here but not built in
- the kernel will be ignored.
+ the kernel will be ignored. If the boot parameter
+ "lsm.order=" is used, it will override this order, with any
+ unlisted LSMs falling back to the order of this config, etc.
If unsure, leave this as the default.
diff --git a/security/security.c b/security/security.c
index 7d542e78b7e8..d682342b6450 100644
--- a/security/security.c
+++ b/security/security.c
@@ -146,7 +146,6 @@ static void __init parse_lsm_order(const char *order, const char *origin)
for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) {
if (lsm->order == LSM_ORDER_MUTABLE &&
- (lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0 &&
strcmp(lsm->name, name) == 0) {
append_ordered_lsm(lsm, origin);
found = true;
@@ -178,8 +177,7 @@ static void __init prepare_lsm_order(void)
/* Add any missing LSMs, in link order. */
for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) {
- if (lsm->order == LSM_ORDER_MUTABLE &&
- (lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0)
+ if (lsm->order == LSM_ORDER_MUTABLE)
append_ordered_lsm(lsm, "link-time");
}
@@ -237,18 +235,6 @@ static void __init ordered_lsm_init(void)
maybe_initialize_lsm(*lsm);
}
-static void __init major_lsm_init(void)
-{
- struct lsm_info *lsm;
-
- for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) {
- if ((lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0)
- continue;
-
- maybe_initialize_lsm(lsm);
- }
-}
-
static void __init parse_lsm_enable(const char *str,
bool enabled)
{
@@ -282,8 +268,6 @@ static void __init prepare_lsm_enable(void)
parse_lsm_enable(chosen_lsm_disable, false);
/* Process "security=", if given. */
- if (!chosen_major_lsm)
- chosen_major_lsm = CONFIG_DEFAULT_SECURITY;
if (chosen_major_lsm) {
struct lsm_info *lsm;
@@ -326,11 +310,6 @@ int __init security_init(void)
prepare_lsm_order();
ordered_lsm_init();
- /*
- * Load all the remaining security modules.
- */
- major_lsm_init();
-
kfree(ordered_lsms);
return 0;
}
--
2.17.1
next prev parent reply other threads:[~2018-10-02 0:55 UTC|newest]
Thread overview: 184+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 0:54 [PATCH security-next v4 00/32] LSM: Explict LSM ordering Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 01/32] LSM: Correctly announce start of LSM initialization Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 02/32] vmlinux.lds.h: Avoid copy/paste of security_init section Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 03/32] LSM: Rename .security_initcall section to .lsm_info Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 04/32] LSM: Remove initcall tracing Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 21:14 ` James Morris
2018-10-02 21:14 ` James Morris
2018-10-02 0:54 ` [PATCH security-next v4 05/32] LSM: Convert from initcall to struct lsm_info Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 06/32] vmlinux.lds.h: Move LSM_TABLE into INIT_DATA Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 21:15 ` James Morris
2018-10-02 21:15 ` James Morris
2018-10-02 0:54 ` [PATCH security-next v4 07/32] LSM: Convert security_initcall() into DEFINE_LSM() Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 21:16 ` James Morris
2018-10-02 21:16 ` James Morris
2018-10-02 0:54 ` [PATCH security-next v4 08/32] LSM: Record LSM name in struct lsm_info Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 09/32] LSM: Provide init debugging infrastructure Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 21:17 ` James Morris
2018-10-02 21:17 ` James Morris
2018-10-02 0:54 ` [PATCH security-next v4 10/32] LSM: Don't ignore initialization failures Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 21:20 ` James Morris
2018-10-02 21:20 ` James Morris
2018-10-02 21:38 ` Kees Cook
2018-10-02 21:38 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 11/32] LSM: Introduce LSM_FLAG_LEGACY_MAJOR Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 12/32] LSM: Provide separate ordered initialization Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 13/32] LoadPin: Rename "enable" to "enforce" Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 1:06 ` Randy Dunlap
2018-10-02 1:06 ` Randy Dunlap
2018-10-02 4:47 ` Kees Cook
2018-10-02 4:47 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 14/32] LSM: Plumb visibility into optional "enabled" state Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 15/32] LSM: Lift LSM selection out of individual LSMs Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 16/32] LSM: Prepare for arbitrary LSM enabling Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 17/32] LSM: Introduce CONFIG_LSM_ENABLE Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 18/32] LSM: Introduce lsm.enable= and lsm.disable= Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 19/32] LSM: Prepare for reorganizing "security=" logic Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 20/32] LSM: Refactor "security=" in terms of enable/disable Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 21/32] LSM: Finalize centralized LSM enabling logic Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 1:18 ` Randy Dunlap
2018-10-02 1:18 ` Randy Dunlap
2018-10-02 4:49 ` Kees Cook
2018-10-02 4:49 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 22/32] apparmor: Remove boot parameter Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 23/32] selinux: " Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 12:12 ` Paul Moore
2018-10-02 12:12 ` Paul Moore
2018-10-02 13:42 ` Stephen Smalley
2018-10-02 13:42 ` Stephen Smalley
2018-10-02 14:44 ` Kees Cook
2018-10-02 14:44 ` Kees Cook
2018-10-02 14:58 ` Stephen Smalley
2018-10-02 14:58 ` Stephen Smalley
2018-10-02 16:33 ` Jordan Glover
2018-10-02 16:33 ` Jordan Glover
2018-10-02 16:54 ` Kees Cook
2018-10-02 16:54 ` Kees Cook
2018-10-02 18:33 ` Stephen Smalley
2018-10-02 18:33 ` Stephen Smalley
2018-10-02 19:02 ` Kees Cook
2018-10-02 19:02 ` Kees Cook
2018-10-02 18:57 ` John Johansen
2018-10-02 18:57 ` John Johansen
2018-10-02 19:17 ` Kees Cook
2018-10-02 19:17 ` Kees Cook
2018-10-02 19:47 ` John Johansen
2018-10-02 19:47 ` John Johansen
2018-10-02 20:29 ` Kees Cook
2018-10-02 20:29 ` Kees Cook
2018-10-02 21:11 ` John Johansen
2018-10-02 21:11 ` John Johansen
2018-10-02 22:06 ` James Morris
2018-10-02 22:06 ` James Morris
2018-10-02 23:06 ` Kees Cook
2018-10-02 23:06 ` Kees Cook
2018-10-02 23:46 ` John Johansen
2018-10-02 23:46 ` John Johansen
2018-10-02 23:54 ` Kees Cook
2018-10-02 23:54 ` Kees Cook
2018-10-03 0:05 ` John Johansen
2018-10-03 0:05 ` John Johansen
2018-10-03 0:12 ` Kees Cook
2018-10-03 0:12 ` Kees Cook
2018-10-03 13:15 ` John Johansen
2018-10-03 13:15 ` John Johansen
2018-10-03 13:39 ` Stephen Smalley
2018-10-03 13:39 ` Stephen Smalley
2018-10-03 17:26 ` Kees Cook
2018-10-03 17:26 ` Kees Cook
2018-10-03 19:43 ` Stephen Smalley
2018-10-03 19:43 ` Stephen Smalley
2018-10-04 5:38 ` John Johansen
2018-10-04 5:38 ` John Johansen
2018-10-04 16:02 ` Kees Cook
2018-10-04 16:02 ` Kees Cook
2018-10-08 14:25 ` Paul Moore
2018-10-08 14:25 ` Paul Moore
2018-10-03 18:17 ` James Morris
2018-10-03 18:17 ` James Morris
2018-10-03 18:20 ` Kees Cook
2018-10-03 18:20 ` Kees Cook
2018-10-03 18:28 ` James Morris
2018-10-03 18:28 ` James Morris
2018-10-03 20:10 ` Kees Cook
2018-10-03 20:10 ` Kees Cook
2018-10-03 20:36 ` Kees Cook
2018-10-03 20:36 ` Kees Cook
2018-10-03 21:19 ` James Morris
2018-10-03 21:19 ` James Morris
2018-10-04 5:56 ` John Johansen
2018-10-04 5:56 ` John Johansen
2018-10-04 16:18 ` Kees Cook
2018-10-04 16:18 ` Kees Cook
2018-10-04 17:40 ` Jordan Glover
2018-10-04 17:40 ` Jordan Glover
2018-10-04 17:42 ` Kees Cook
2018-10-04 17:42 ` Kees Cook
2018-10-03 21:34 ` James Morris
2018-10-03 21:34 ` James Morris
2018-10-03 23:55 ` Kees Cook
2018-10-03 23:55 ` Kees Cook
2018-10-03 23:59 ` Randy Dunlap
2018-10-03 23:59 ` Randy Dunlap
2018-10-04 0:03 ` Kees Cook
2018-10-04 0:03 ` Kees Cook
2018-10-04 6:22 ` John Johansen
2018-10-04 6:22 ` John Johansen
2018-10-04 6:18 ` John Johansen
2018-10-04 6:18 ` John Johansen
2018-10-04 17:49 ` James Morris
2018-10-04 17:49 ` James Morris
2018-10-05 0:05 ` Kees Cook
2018-10-05 0:05 ` Kees Cook
2018-10-05 4:58 ` James Morris
2018-10-05 4:58 ` James Morris
2018-10-05 16:29 ` James Morris
2018-10-05 16:29 ` James Morris
2018-10-05 16:35 ` Kees Cook
2018-10-05 16:35 ` Kees Cook
2018-10-02 23:28 ` John Johansen
2018-10-02 23:28 ` John Johansen
2018-10-02 16:34 ` Kees Cook
2018-10-02 16:34 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 24/32] LSM: Build ordered list of ordered LSMs for init Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 25/32] LSM: Introduce CONFIG_LSM_ORDER Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:54 ` [PATCH security-next v4 26/32] LSM: Introduce "lsm.order=" for boottime ordering Kees Cook
2018-10-02 0:54 ` Kees Cook
2018-10-02 0:55 ` [PATCH security-next v4 27/32] LoadPin: Initialize as ordered LSM Kees Cook
2018-10-02 0:55 ` Kees Cook
2018-10-02 0:55 ` [PATCH security-next v4 28/32] Yama: " Kees Cook
2018-10-02 0:55 ` Kees Cook
2018-10-02 0:55 ` [PATCH security-next v4 29/32] LSM: Introduce enum lsm_order Kees Cook
2018-10-02 0:55 ` Kees Cook
2018-10-02 0:55 ` [PATCH security-next v4 30/32] capability: Initialize as LSM_ORDER_FIRST Kees Cook
2018-10-02 0:55 ` Kees Cook
2018-10-02 0:55 ` [PATCH security-next v4 31/32] LSM: Separate idea of "major" LSM from "exclusive" LSM Kees Cook
2018-10-02 0:55 ` Kees Cook
2018-10-02 0:55 ` Kees Cook [this message]
2018-10-02 0:55 ` [PATCH security-next v4 32/32] LSM: Add all exclusive LSMs to ordered initialization Kees Cook
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=20181002005505.6112-33-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=casey.schaufler@intel.com \
--cc=casey@schaufler-ca.com \
--cc=corbet@lwn.net \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=paul@paul-moore.com \
--cc=penguin-kernel@i-love.sakura.ne.jp \
--cc=sds@tycho.nsa.gov \
/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).