From: Kees Cook <keescook@chromium.org> To: James Morris <jmorris@namei.org> Cc: Kees Cook <keescook@chromium.org>, John Johansen <john.johansen@canonical.com>, "Serge E. Hallyn" <serge@hallyn.com>, Paul Moore <paul@paul-moore.com>, Stephen Smalley <sds@tycho.nsa.gov>, Casey Schaufler <casey@schaufler-ca.com>, Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>, Mimi Zohar <zohar@linux.vnet.ibm.com>, linux-security-module@vger.kernel.org, selinux@tycho.nsa.gov, Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>, "Schaufler, Casey" <casey.schaufler@intel.com>, Jonathan Corbet <corbet@lwn.net>, linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v3 07/29] LSM: Convert security_initcall() into DEFINE_LSM() Date: Mon, 24 Sep 2018 17:18:10 -0700 [thread overview] Message-ID: <20180925001832.18322-8-keescook@chromium.org> (raw) In-Reply-To: <20180925001832.18322-1-keescook@chromium.org> Instead of using argument-based initializers, switch to defining the contents of struct lsm_info on a per-LSM basis. This also drops the final use of the now inaccurate "initcall" naming. Cc: John Johansen <john.johansen@canonical.com> Cc: James Morris <jmorris@namei.org> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: Paul Moore <paul@paul-moore.com> Cc: Stephen Smalley <sds@tycho.nsa.gov> Cc: Casey Schaufler <casey@schaufler-ca.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: linux-security-module@vger.kernel.org Cc: selinux@tycho.nsa.gov Signed-off-by: Kees Cook <keescook@chromium.org> --- include/linux/lsm_hooks.h | 6 ++++-- security/apparmor/lsm.c | 4 +++- security/integrity/iint.c | 4 +++- security/selinux/hooks.c | 4 +++- security/smack/smack_lsm.c | 4 +++- security/tomoyo/tomoyo.c | 4 +++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index ad04761e5587..02ec717189f9 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2045,11 +2045,13 @@ struct lsm_info { extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; -#define security_initcall(lsm) \ +#define DEFINE_LSM(lsm) \ static struct lsm_info __lsm_##lsm \ __used __section(.lsm_info.init) \ __aligned(sizeof(unsigned long)) \ - = { .init = lsm, } + = { \ + +#define END_LSM } #ifdef CONFIG_SECURITY_SELINUX_DISABLE /* diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 8b8b70620bbe..7fa7b4464cf4 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1606,4 +1606,6 @@ static int __init apparmor_init(void) return error; } -security_initcall(apparmor_init); +DEFINE_LSM(apparmor) + .init = apparmor_init, +END_LSM; diff --git a/security/integrity/iint.c b/security/integrity/iint.c index 70d21b566955..20e60df929a3 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -175,7 +175,9 @@ static int __init integrity_iintcache_init(void) 0, SLAB_PANIC, init_once); return 0; } -security_initcall(integrity_iintcache_init); +DEFINE_LSM(integrity) + .init = integrity_iintcache_init, +END_LSM; /* diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ad9a9b8e9979..469a90806bc6 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -7202,7 +7202,9 @@ void selinux_complete_init(void) /* SELinux requires early initialization in order to label all processes and objects when they are created. */ -security_initcall(selinux_init); +DEFINE_LSM(selinux) + .init = selinux_init, +END_LSM; #if defined(CONFIG_NETFILTER) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 340fc30ad85d..1e1ace718e75 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -4882,4 +4882,6 @@ static __init int smack_init(void) * Smack requires early initialization in order to label * all processes and objects when they are created. */ -security_initcall(smack_init); +DEFINE_LSM(smack) + .init = smack_init, +END_LSM; diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 9f932e2d6852..a280d4eab456 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c @@ -550,4 +550,6 @@ static int __init tomoyo_init(void) return 0; } -security_initcall(tomoyo_init); +DEFINE_LSM(tomoyo) + .init = tomoyo_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 v3 07/29] LSM: Convert security_initcall() into DEFINE_LSM() Date: Mon, 24 Sep 2018 17:18:10 -0700 [thread overview] Message-ID: <20180925001832.18322-8-keescook@chromium.org> (raw) In-Reply-To: <20180925001832.18322-1-keescook@chromium.org> Instead of using argument-based initializers, switch to defining the contents of struct lsm_info on a per-LSM basis. This also drops the final use of the now inaccurate "initcall" naming. Cc: John Johansen <john.johansen@canonical.com> Cc: James Morris <jmorris@namei.org> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: Paul Moore <paul@paul-moore.com> Cc: Stephen Smalley <sds@tycho.nsa.gov> Cc: Casey Schaufler <casey@schaufler-ca.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: linux-security-module at vger.kernel.org Cc: selinux at tycho.nsa.gov Signed-off-by: Kees Cook <keescook@chromium.org> --- include/linux/lsm_hooks.h | 6 ++++-- security/apparmor/lsm.c | 4 +++- security/integrity/iint.c | 4 +++- security/selinux/hooks.c | 4 +++- security/smack/smack_lsm.c | 4 +++- security/tomoyo/tomoyo.c | 4 +++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index ad04761e5587..02ec717189f9 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2045,11 +2045,13 @@ struct lsm_info { extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; -#define security_initcall(lsm) \ +#define DEFINE_LSM(lsm) \ static struct lsm_info __lsm_##lsm \ __used __section(.lsm_info.init) \ __aligned(sizeof(unsigned long)) \ - = { .init = lsm, } + = { \ + +#define END_LSM } #ifdef CONFIG_SECURITY_SELINUX_DISABLE /* diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 8b8b70620bbe..7fa7b4464cf4 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1606,4 +1606,6 @@ static int __init apparmor_init(void) return error; } -security_initcall(apparmor_init); +DEFINE_LSM(apparmor) + .init = apparmor_init, +END_LSM; diff --git a/security/integrity/iint.c b/security/integrity/iint.c index 70d21b566955..20e60df929a3 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -175,7 +175,9 @@ static int __init integrity_iintcache_init(void) 0, SLAB_PANIC, init_once); return 0; } -security_initcall(integrity_iintcache_init); +DEFINE_LSM(integrity) + .init = integrity_iintcache_init, +END_LSM; /* diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ad9a9b8e9979..469a90806bc6 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -7202,7 +7202,9 @@ void selinux_complete_init(void) /* SELinux requires early initialization in order to label all processes and objects when they are created. */ -security_initcall(selinux_init); +DEFINE_LSM(selinux) + .init = selinux_init, +END_LSM; #if defined(CONFIG_NETFILTER) diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 340fc30ad85d..1e1ace718e75 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -4882,4 +4882,6 @@ static __init int smack_init(void) * Smack requires early initialization in order to label * all processes and objects when they are created. */ -security_initcall(smack_init); +DEFINE_LSM(smack) + .init = smack_init, +END_LSM; diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index 9f932e2d6852..a280d4eab456 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c @@ -550,4 +550,6 @@ static int __init tomoyo_init(void) return 0; } -security_initcall(tomoyo_init); +DEFINE_LSM(tomoyo) + .init = tomoyo_init, +END_LSM; -- 2.17.1
next prev parent reply other threads:[~2018-09-25 0:20 UTC|newest] Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-25 0:18 [PATCH security-next v3 00/29] LSM: Explict LSM ordering Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 01/29] LSM: Correctly announce start of LSM initialization Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 19:53 ` James Morris 2018-10-01 21:05 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 02/29] vmlinux.lds.h: Avoid copy/paste of security_init section Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 19:56 ` James Morris 2018-10-01 21:05 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 03/29] LSM: Rename .security_initcall section to .lsm_info Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 19:57 ` James Morris 2018-10-01 21:06 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 04/29] LSM: Remove initcall tracing Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-26 16:35 ` Steven Rostedt 2018-09-26 16:35 ` Steven Rostedt 2018-09-26 18:35 ` Kees Cook 2018-09-26 18:35 ` Kees Cook 2018-09-30 23:25 ` Steven Rostedt 2018-09-30 23:25 ` Steven Rostedt 2018-10-01 1:01 ` Kees Cook 2018-10-01 1:01 ` Kees Cook 2018-10-01 21:07 ` John Johansen 2018-10-01 21:23 ` Steven Rostedt 2018-10-01 22:38 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 05/29] LSM: Convert from initcall to struct lsm_info Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 19:59 ` James Morris 2018-10-01 21:08 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 06/29] vmlinux.lds.h: Move LSM_TABLE into INIT_DATA Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:10 ` John Johansen 2018-09-25 0:18 ` Kees Cook [this message] 2018-09-25 0:18 ` [PATCH security-next v3 07/29] LSM: Convert security_initcall() into DEFINE_LSM() Kees Cook 2018-10-01 21:12 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 08/29] LSM: Record LSM name in struct lsm_info Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:13 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 09/29] LSM: Provide init debugging infrastructure Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:14 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 10/29] LSM: Don't ignore initialization failures Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:14 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 11/29] LSM: Introduce LSM_FLAG_LEGACY_MAJOR Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:15 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 12/29] LSM: Provide separate ordered initialization Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:17 ` John Johansen 2018-10-01 22:03 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 13/29] LoadPin: Rename "enable" to "enforce" Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:17 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 14/29] LSM: Plumb visibility into optional "enabled" state Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:18 ` John Johansen 2018-10-01 21:47 ` James Morris 2018-10-01 21:56 ` Kees Cook 2018-10-01 22:20 ` John Johansen 2018-10-01 22:29 ` Kees Cook 2018-10-01 22:53 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 15/29] LSM: Lift LSM selection out of individual LSMs Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:18 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 16/29] LSM: Prepare for arbitrary LSM enabling Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:22 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 17/29] LSM: Introduce CONFIG_LSM_ENABLE Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:34 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 18/29] LSM: Introduce lsm.enable= and lsm.disable= Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:46 ` John Johansen 2018-10-01 22:27 ` Kees Cook 2018-10-01 22:48 ` John Johansen 2018-10-01 23:30 ` Kees Cook 2018-10-01 23:38 ` Kees Cook 2018-10-01 23:57 ` John Johansen 2018-10-01 23:44 ` John Johansen 2018-10-01 23:49 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 19/29] LSM: Prepare for reorganizing "security=" logic Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-10-01 21:47 ` John Johansen 2018-09-25 0:18 ` [PATCH security-next v3 20/29] LSM: Refactor "security=" in terms of enable/disable Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 21/29] LSM: Build ordered list of ordered LSMs for init Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 22/29] LSM: Introduce CONFIG_LSM_ORDER Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 23/29] LSM: Introduce "lsm.order=" for boottime ordering Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 24/29] LoadPin: Initialize as ordered LSM Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 25/29] Yama: " Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 26/29] LSM: Introduce enum lsm_order Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 27/29] capability: Initialize as LSM_ORDER_FIRST Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 28/29] LSM: Separate idea of "major" LSM from "exclusive" LSM Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-25 0:18 ` [PATCH security-next v3 29/29] LSM: Add all exclusive LSMs to ordered initialization Kees Cook 2018-09-25 0:18 ` Kees Cook 2018-09-28 15:55 ` [PATCH security-next v3 00/29] LSM: Explict LSM ordering Casey Schaufler 2018-09-28 15:55 ` Casey Schaufler 2018-09-28 20:01 ` Kees Cook 2018-09-28 20:01 ` Kees Cook 2018-09-28 20:25 ` Stephen Smalley 2018-09-28 20:25 ` Stephen Smalley 2018-09-28 20:33 ` Stephen Smalley 2018-09-28 20:33 ` Stephen Smalley 2018-09-28 20:54 ` Kees Cook 2018-09-28 20:54 ` Kees Cook 2018-09-29 10:48 ` Tetsuo Handa 2018-09-29 10:48 ` Tetsuo Handa 2018-09-29 18:18 ` Kees Cook 2018-09-29 18:18 ` Kees Cook 2018-09-30 2:36 ` Tetsuo Handa 2018-09-30 2:36 ` Tetsuo Handa 2018-09-30 16:57 ` Kees Cook 2018-09-30 16:57 ` Kees Cook 2018-09-29 18:19 ` John Johansen 2018-09-29 18:19 ` John Johansen
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=20180925001832.18322-8-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 \ --cc=selinux@tycho.nsa.gov \ --cc=serge@hallyn.com \ --cc=zohar@linux.vnet.ibm.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: 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.