LSM: Convert security_initcall() into DEFINE_LSM()

kees · James Morris · commit 3d6e5f6dcf65 · 2018-10-10T20:40:21.000-07:00
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.

Signed-off-by: Kees Cook &lt;keescook@chromium.org&gt;
Reviewed-by: Casey Schaufler &lt;casey@schaufler-ca.com&gt;
Reviewed-by: James Morris &lt;james.morris@microsoft.com&gt;
Signed-off-by: James Morris &lt;james.morris@microsoft.com&gt;
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
@@ -2045,11 +2045,10 @@ 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, }
+		__aligned(sizeof(unsigned long))
 
 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
 /*
diff --git 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,
+};
diff --git 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,
+};
 
 
 /*
diff --git 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,
+};
 
 #if defined(CONFIG_NETFILTER)
 
diff --git 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,
+};
diff --git 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,
+};

Original file line number	Diff line number	Diff line change
`@@ -1606,4 +1606,6 @@ static int __init apparmor_init(void)`
`1606`	`1606`	`return error;`
`1607`	`1607`	`}`
`1608`	`1608`
`1609`		`-security_initcall(apparmor_init);`
	`1609`	`+DEFINE_LSM(apparmor) = {`
	`1610`	`+ .init = apparmor_init,`
	`1611`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,9 @@ static int __init integrity_iintcache_init(void)`
`175`	`175`	`0, SLAB_PANIC, init_once);`
`176`	`176`	`return 0;`
`177`	`177`	`}`
`178`		`-security_initcall(integrity_iintcache_init);`
	`178`	`+DEFINE_LSM(integrity) = {`
	`179`	`+ .init = integrity_iintcache_init,`
	`180`	`+};`
`179`	`181`
`180`	`182`
`181`	`183`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -550,4 +550,6 @@ static int __init tomoyo_init(void)`
`550`	`550`	`return 0;`
`551`	`551`	`}`
`552`	`552`
`553`		`-security_initcall(tomoyo_init);`
	`553`	`+DEFINE_LSM(tomoyo) = {`
	`554`	`+ .init = tomoyo_init,`
	`555`	`+};`