LSM: Record LSM name in struct lsm_info

kees · James Morris · commit 07aed2f2af5a · 2018-10-10T20:40:22.000-07:00
In preparation for making LSM selections outside of the LSMs, include
the name of LSMs in struct lsm_info.

Signed-off-by: Kees Cook &lt;keescook@chromium.org&gt;
Reviewed-by: Casey Schaufler &lt;casey@schaufler-ca.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
@@ -2040,6 +2040,7 @@ extern void security_add_hooks(struct security_hook_list *hooks, int count,
 				char *lsm);
 
 struct lsm_info {
+	const char *name;	/* Required. */
 	int (*init)(void);	/* Required. */
 };
 
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
@@ -1607,5 +1607,6 @@ static int __init apparmor_init(void)
 }
 
 DEFINE_LSM(apparmor) = {
+	.name = "apparmor",
 	.init = apparmor_init,
 };
diff --git a/security/integrity/iint.c b/security/integrity/iint.c
@@ -176,6 +176,7 @@ static int __init integrity_iintcache_init(void)
 	return 0;
 }
 DEFINE_LSM(integrity) = {
+	.name = "integrity",
 	.init = integrity_iintcache_init,
 };
 
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
@@ -7203,6 +7203,7 @@ void selinux_complete_init(void)
 /* SELinux requires early initialization in order to label
    all processes and objects when they are created. */
 DEFINE_LSM(selinux) = {
+	.name = "selinux",
 	.init = selinux_init,
 };
 
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
@@ -4883,5 +4883,6 @@ static __init int smack_init(void)
  * all processes and objects when they are created.
  */
 DEFINE_LSM(smack) = {
+	.name = "smack",
 	.init = smack_init,
 };
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
@@ -551,5 +551,6 @@ static int __init tomoyo_init(void)
 }
 
 DEFINE_LSM(tomoyo) = {
+	.name = "tomoyo",
 	.init = tomoyo_init,
 };

Original file line number	Diff line number	Diff line change
`@@ -1607,5 +1607,6 @@ static int __init apparmor_init(void)`
`1607`	`1607`	`}`
`1608`	`1608`
`1609`	`1609`	`DEFINE_LSM(apparmor) = {`
	`1610`	`+ .name = "apparmor",`
`1610`	`1611`	`.init = apparmor_init,`
`1611`	`1612`	`};`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ static int __init integrity_iintcache_init(void)`
`176`	`176`	`return 0;`
`177`	`177`	`}`
`178`	`178`	`DEFINE_LSM(integrity) = {`
	`179`	`+ .name = "integrity",`
`179`	`180`	`.init = integrity_iintcache_init,`
`180`	`181`	`};`
`181`	`182`
Original file line number	Diff line number	Diff line change
`@@ -551,5 +551,6 @@ static int __init tomoyo_init(void)`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`DEFINE_LSM(tomoyo) = {`
	`554`	`+ .name = "tomoyo",`
`554`	`555`	`.init = tomoyo_init,`
`555`	`556`	`};`