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>, LKLM <linux-kernel@vger.kernel.org> Subject: [PATCH 12/18] LSM: Introduce ordering details in struct lsm_info Date: Sat, 15 Sep 2018 17:30:53 -0700 [thread overview] Message-ID: <20180916003059.1046-13-keescook@chromium.org> (raw) In-Reply-To: <20180916003059.1046-1-keescook@chromium.org> Only minor LSMs have any ordering currently, but only capabilities actually need to go first, so provide either "absolutely first" or "mutable" ordering currently. Default order is "mutable". Signed-off-by: Kees Cook <keescook@chromium.org> --- include/linux/lsm_hooks.h | 7 +++++++ security/security.c | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 6e71e1c47fa1..89e6ec8eac07 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2044,10 +2044,17 @@ enum lsm_type { LSM_TYPE_MINOR, }; +enum lsm_order { + LSM_ORDER_FIRST = -1, /* This is only for capabilities. */ + LSM_ORDER_MUTABLE = 0, + LSM_ORDER_MAX, +}; + struct lsm_info { const char *name; /* Populated automatically. */ int *enabled; /* Optional: NULL means enabled. */ enum lsm_type type; /* Optional: default is LSM_TYPE_EXCLUSIVE */ + enum lsm_order order; /* Optional: default is LSM_ORDER_MUTABLE */ int (*init)(void); }; diff --git a/security/security.c b/security/security.c index 3fedbee5f3ec..19afd7949426 100644 --- a/security/security.c +++ b/security/security.c @@ -96,10 +96,13 @@ static void __init maybe_enable_lsm(struct lsm_info *lsm) static void __init lsm_init(enum lsm_type type) { struct lsm_info *lsm; + enum lsm_order order; - for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { - if (lsm->type == type) - maybe_enable_lsm(lsm); + for (order = LSM_ORDER_FIRST; order < LSM_ORDER_MAX; order++) { + for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { + if (lsm->type == type && lsm->order == order) + maybe_enable_lsm(lsm); + } } } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: keescook@chromium.org (Kees Cook) To: linux-security-module@vger.kernel.org Subject: [PATCH 12/18] LSM: Introduce ordering details in struct lsm_info Date: Sat, 15 Sep 2018 17:30:53 -0700 [thread overview] Message-ID: <20180916003059.1046-13-keescook@chromium.org> (raw) In-Reply-To: <20180916003059.1046-1-keescook@chromium.org> Only minor LSMs have any ordering currently, but only capabilities actually need to go first, so provide either "absolutely first" or "mutable" ordering currently. Default order is "mutable". Signed-off-by: Kees Cook <keescook@chromium.org> --- include/linux/lsm_hooks.h | 7 +++++++ security/security.c | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 6e71e1c47fa1..89e6ec8eac07 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2044,10 +2044,17 @@ enum lsm_type { LSM_TYPE_MINOR, }; +enum lsm_order { + LSM_ORDER_FIRST = -1, /* This is only for capabilities. */ + LSM_ORDER_MUTABLE = 0, + LSM_ORDER_MAX, +}; + struct lsm_info { const char *name; /* Populated automatically. */ int *enabled; /* Optional: NULL means enabled. */ enum lsm_type type; /* Optional: default is LSM_TYPE_EXCLUSIVE */ + enum lsm_order order; /* Optional: default is LSM_ORDER_MUTABLE */ int (*init)(void); }; diff --git a/security/security.c b/security/security.c index 3fedbee5f3ec..19afd7949426 100644 --- a/security/security.c +++ b/security/security.c @@ -96,10 +96,13 @@ static void __init maybe_enable_lsm(struct lsm_info *lsm) static void __init lsm_init(enum lsm_type type) { struct lsm_info *lsm; + enum lsm_order order; - for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { - if (lsm->type == type) - maybe_enable_lsm(lsm); + for (order = LSM_ORDER_FIRST; order < LSM_ORDER_MAX; order++) { + for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { + if (lsm->type == type && lsm->order == order) + maybe_enable_lsm(lsm); + } } } -- 2.17.1
next prev parent reply other threads:[~2018-09-16 0:31 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-16 0:30 [PATCH 00/18] LSM: Prepare for explict LSM ordering Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 01/18] vmlinux.lds.h: Avoid copy/paste of security_init section Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 02/18] LSM: Rename .security_initcall section to .lsm_info Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 03/18] LSM: Remove initcall tracing Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 04/18] LSM: Convert from initcall to struct lsm_info Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 05/18] vmlinux.lds.h: Move LSM_TABLE into INIT_DATA Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 06/18] LSM: Convert security_initcall() into DEFINE_LSM() Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 07/18] LSM: Add minor LSM initialization loop Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 1:27 ` Jann Horn 2018-09-16 1:27 ` Jann Horn 2018-09-16 1:49 ` Kees Cook 2018-09-16 1:49 ` Kees Cook 2018-09-16 0:30 ` [PATCH 08/18] integrity: Initialize as LSM_TYPE_MINOR Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 09/18] LSM: Record LSM name in struct lsm_info Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 10/18] LSM: Plumb visibility into optional "enabled" state Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 11/18] LSM: Lift LSM selection out of individual LSMs Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 1:32 ` Jann Horn 2018-09-16 1:32 ` Jann Horn 2018-09-16 1:47 ` Kees Cook 2018-09-16 1:47 ` Kees Cook 2018-09-16 0:30 ` Kees Cook [this message] 2018-09-16 0:30 ` [PATCH 12/18] LSM: Introduce ordering details in struct lsm_info Kees Cook 2018-09-16 0:30 ` [PATCH 13/18] LoadPin: Initialize as LSM_TYPE_MINOR Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 14/18] Yama: " Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 15/18] capability: " Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 16/18] LSM: Allow arbitrary LSM ordering Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 18:49 ` Casey Schaufler 2018-09-16 18:49 ` Casey Schaufler 2018-09-16 23:00 ` Kees Cook 2018-09-16 23:00 ` Kees Cook 2018-09-17 0:46 ` Tetsuo Handa 2018-09-17 0:46 ` Tetsuo Handa 2018-09-17 15:06 ` Casey Schaufler 2018-09-17 15:06 ` Casey Schaufler 2018-09-17 16:24 ` Kees Cook 2018-09-17 16:24 ` Kees Cook 2018-09-17 17:13 ` Casey Schaufler 2018-09-17 17:13 ` Casey Schaufler 2018-09-17 18:14 ` Kees Cook 2018-09-17 18:14 ` Kees Cook 2018-09-17 19:23 ` Casey Schaufler 2018-09-17 19:23 ` Casey Schaufler 2018-09-17 19:55 ` John Johansen 2018-09-17 19:55 ` John Johansen 2018-09-17 21:57 ` Casey Schaufler 2018-09-17 21:57 ` Casey Schaufler 2018-09-17 22:36 ` John Johansen 2018-09-17 22:36 ` John Johansen 2018-09-17 23:10 ` Mickaël Salaün 2018-09-17 23:20 ` Kees Cook 2018-09-17 23:20 ` Kees Cook 2018-09-17 23:26 ` John Johansen 2018-09-17 23:26 ` John Johansen 2018-09-17 23:28 ` Kees Cook 2018-09-17 23:28 ` Kees Cook 2018-09-17 23:40 ` Casey Schaufler 2018-09-17 23:40 ` Casey Schaufler 2018-09-17 23:30 ` Casey Schaufler 2018-09-17 23:30 ` Casey Schaufler 2018-09-17 23:47 ` Mickaël Salaün 2018-09-18 0:00 ` Casey Schaufler 2018-09-18 0:00 ` Casey Schaufler 2018-09-17 23:25 ` John Johansen 2018-09-17 23:25 ` John Johansen 2018-09-17 23:25 ` Casey Schaufler 2018-09-17 23:25 ` Casey Schaufler 2018-09-18 0:00 ` Kees Cook 2018-09-18 0:00 ` Kees Cook 2018-09-18 0:24 ` Casey Schaufler 2018-09-18 0:24 ` Casey Schaufler 2018-09-18 0:45 ` Kees Cook 2018-09-18 0:45 ` Kees Cook 2018-09-18 0:57 ` Casey Schaufler 2018-09-18 0:57 ` Casey Schaufler 2018-09-18 0:59 ` Kees Cook 2018-09-18 0:59 ` Kees Cook 2018-09-18 1:08 ` John Johansen 2018-09-18 1:08 ` John Johansen 2018-09-17 19:35 ` John Johansen 2018-09-17 19:35 ` John Johansen 2018-09-16 0:30 ` [PATCH 17/18] LSM: Provide init debugging Kees Cook 2018-09-16 0:30 ` Kees Cook 2018-09-16 0:30 ` [PATCH 18/18] LSM: Don't ignore initialization failures Kees Cook 2018-09-16 0:30 ` 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=20180916003059.1046-13-keescook@chromium.org \ --to=keescook@chromium.org \ --cc=casey.schaufler@intel.com \ --cc=casey@schaufler-ca.com \ --cc=jmorris@namei.org \ --cc=john.johansen@canonical.com \ --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: 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.