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 v2 22/26] Yama: Initialize as ordered LSM Date: Thu, 20 Sep 2018 09:23:34 -0700 [thread overview] Message-ID: <20180920162338.21060-23-keescook@chromium.org> (raw) In-Reply-To: <20180920162338.21060-1-keescook@chromium.org> This converts Yama from being a direct "minor" LSM into an ordered LSM. Signed-off-by: Kees Cook <keescook@chromium.org> --- include/linux/lsm_hooks.h | 5 ----- security/Kconfig | 2 +- security/security.c | 1 - security/yama/yama_lsm.c | 7 ++++++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 7a38ffdd690f..d75a42eb3ddd 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2092,10 +2092,5 @@ static inline void security_delete_hooks(struct security_hook_list *hooks, #endif /* CONFIG_SECURITY_WRITABLE_HOOKS */ extern void __init capability_add_hooks(void); -#ifdef CONFIG_SECURITY_YAMA -extern void __init yama_add_hooks(void); -#else -static inline void __init yama_add_hooks(void) { } -#endif #endif /* ! __LINUX_LSM_HOOKS_H */ diff --git a/security/Kconfig b/security/Kconfig index f2003bd03ef6..33c9ac3cb759 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -278,7 +278,7 @@ config DEFAULT_SECURITY config LSM_ORDER string "Default initialization order of builtin LSMs" - default "loadpin,integrity" + default "yama,loadpin,integrity" help A comma-separated list of LSMs, in initialization order. Any LSMs left off this list will be link-order initialized diff --git a/security/security.c b/security/security.c index 9ffb76b7655b..3fba28de789b 100644 --- a/security/security.c +++ b/security/security.c @@ -245,7 +245,6 @@ int __init security_init(void) * Load minor LSMs, with the capability module always first. */ capability_add_hooks(); - yama_add_hooks(); /* Load LSMs in specified order. */ prepare_lsm_order(); diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index ffda91a4a1aa..f2b1f47f98e8 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -477,9 +477,14 @@ static void __init yama_init_sysctl(void) static inline void yama_init_sysctl(void) { } #endif /* CONFIG_SYSCTL */ -void __init yama_add_hooks(void) +static int __init yama_init(void) { pr_info("Yama: becoming mindful.\n"); security_add_hooks(yama_hooks, ARRAY_SIZE(yama_hooks), "yama"); yama_init_sysctl(); + return 0; } + +DEFINE_LSM(yama) + .init = yama_init, +END_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 security-next v2 22/26] Yama: Initialize as ordered LSM Date: Thu, 20 Sep 2018 09:23:34 -0700 [thread overview] Message-ID: <20180920162338.21060-23-keescook@chromium.org> (raw) In-Reply-To: <20180920162338.21060-1-keescook@chromium.org> This converts Yama from being a direct "minor" LSM into an ordered LSM. Signed-off-by: Kees Cook <keescook@chromium.org> --- include/linux/lsm_hooks.h | 5 ----- security/Kconfig | 2 +- security/security.c | 1 - security/yama/yama_lsm.c | 7 ++++++- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 7a38ffdd690f..d75a42eb3ddd 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2092,10 +2092,5 @@ static inline void security_delete_hooks(struct security_hook_list *hooks, #endif /* CONFIG_SECURITY_WRITABLE_HOOKS */ extern void __init capability_add_hooks(void); -#ifdef CONFIG_SECURITY_YAMA -extern void __init yama_add_hooks(void); -#else -static inline void __init yama_add_hooks(void) { } -#endif #endif /* ! __LINUX_LSM_HOOKS_H */ diff --git a/security/Kconfig b/security/Kconfig index f2003bd03ef6..33c9ac3cb759 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -278,7 +278,7 @@ config DEFAULT_SECURITY config LSM_ORDER string "Default initialization order of builtin LSMs" - default "loadpin,integrity" + default "yama,loadpin,integrity" help A comma-separated list of LSMs, in initialization order. Any LSMs left off this list will be link-order initialized diff --git a/security/security.c b/security/security.c index 9ffb76b7655b..3fba28de789b 100644 --- a/security/security.c +++ b/security/security.c @@ -245,7 +245,6 @@ int __init security_init(void) * Load minor LSMs, with the capability module always first. */ capability_add_hooks(); - yama_add_hooks(); /* Load LSMs in specified order. */ prepare_lsm_order(); diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c index ffda91a4a1aa..f2b1f47f98e8 100644 --- a/security/yama/yama_lsm.c +++ b/security/yama/yama_lsm.c @@ -477,9 +477,14 @@ static void __init yama_init_sysctl(void) static inline void yama_init_sysctl(void) { } #endif /* CONFIG_SYSCTL */ -void __init yama_add_hooks(void) +static int __init yama_init(void) { pr_info("Yama: becoming mindful.\n"); security_add_hooks(yama_hooks, ARRAY_SIZE(yama_hooks), "yama"); yama_init_sysctl(); + return 0; } + +DEFINE_LSM(yama) + .init = yama_init, +END_LSM; -- 2.17.1
next prev parent reply other threads:[~2018-09-20 16:30 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-20 16:23 [PATCH security-next v2 00/26] LSM: Explict LSM ordering Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 01/26] LSM: Correctly announce start of LSM initialization Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 23:39 ` Casey Schaufler 2018-09-20 23:39 ` Casey Schaufler 2018-09-20 16:23 ` [PATCH security-next v2 02/26] vmlinux.lds.h: Avoid copy/paste of security_init section Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 03/26] LSM: Rename .security_initcall section to .lsm_info Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 04/26] LSM: Remove initcall tracing Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 05/26] LSM: Convert from initcall to struct lsm_info Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 06/26] vmlinux.lds.h: Move LSM_TABLE into INIT_DATA Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 07/26] LSM: Convert security_initcall() into DEFINE_LSM() Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 08/26] LSM: Record LSM name in struct lsm_info Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 09/26] LSM: Provide init debugging infrastructure Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 10/26] LSM: Don't ignore initialization failures Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 11/26] LSM: Introduce LSM_FLAG_LEGACY_MAJOR Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 12/26] LSM: Provide separate ordered initialization Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 13/26] LSM: Plumb visibility into optional "enabled" state Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 14/26] LSM: Lift LSM selection out of individual LSMs Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 15/26] LSM: Introduce lsm.enable= and lsm.disable= Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 16/26] LSM: Prepare for reorganizing "security=" logic Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 17/26] LSM: Refactor "security=" in terms of enable/disable Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 18/26] LSM: Build ordered list of ordered LSMs for init Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-21 0:04 ` Casey Schaufler 2018-09-21 0:04 ` Casey Schaufler 2018-09-21 0:37 ` Kees Cook 2018-09-21 0:37 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 19/26] LSM: Introduce CONFIG_LSM_ORDER Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-21 0:10 ` Casey Schaufler 2018-09-21 0:10 ` Casey Schaufler 2018-09-21 0:14 ` Casey Schaufler 2018-09-21 0:14 ` Casey Schaufler 2018-09-20 16:23 ` [PATCH security-next v2 20/26] LSM: Introduce "lsm.order=" for boottime ordering Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-21 0:12 ` Casey Schaufler 2018-09-21 0:12 ` Casey Schaufler 2018-09-21 0:40 ` Kees Cook 2018-09-21 0:40 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 21/26] LoadPin: Initialize as ordered LSM Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` Kees Cook [this message] 2018-09-20 16:23 ` [PATCH security-next v2 22/26] Yama: " Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 23/26] LSM: Introduce enum lsm_order Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 24/26] capability: Mark as LSM_ORDER_FIRST Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 25/26] LSM: Separate idea of "major" LSM from "exclusive" LSM Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-20 16:23 ` [PATCH security-next v2 26/26] LSM: Add all exclusive LSMs to ordered initialization Kees Cook 2018-09-20 16:23 ` Kees Cook 2018-09-21 0:25 ` Casey Schaufler 2018-09-21 0:25 ` Casey Schaufler 2018-09-21 0:45 ` Kees Cook 2018-09-21 0:45 ` Kees Cook 2018-09-21 1:10 ` Casey Schaufler 2018-09-21 1:10 ` Casey Schaufler 2018-09-21 1:39 ` John Johansen 2018-09-21 1:39 ` John Johansen 2018-09-21 2:05 ` Kees Cook 2018-09-21 2:05 ` Kees Cook 2018-09-21 2:14 ` John Johansen 2018-09-21 2:14 ` John Johansen 2018-09-21 3:02 ` Kees Cook 2018-09-21 3:02 ` Kees Cook 2018-09-21 13:19 ` John Johansen 2018-09-21 13:19 ` John Johansen 2018-09-21 14:57 ` Casey Schaufler 2018-09-21 14:57 ` Casey Schaufler 2018-09-20 20:14 ` [PATCH security-next v2 00/26] LSM: Explict LSM ordering Martin Steigerwald 2018-09-20 20:14 ` Martin Steigerwald 2018-09-20 21:55 ` Kees Cook 2018-09-20 21:55 ` 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=20180920162338.21060-23-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: 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.