Commit 07aed2f2 authored Oct 10, 2018 by Kees Cook Committed by James Morris Oct 10, 2018

LSM: Record LSM name in struct lsm_info



In preparation for making LSM selections outside of the LSMs, include
the name of LSMs in struct lsm_info.

Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <james.morris@microsoft.com>

parent 3d6e5f6d

include/linux/lsm_hooks.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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. */
		};

security/apparmor/lsm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1607,5 +1607,6 @@ static int __init apparmor_init(void)
		}

		DEFINE_LSM(apparmor) = {
		.name = "apparmor",
		.init = apparmor_init,
		};

security/integrity/iint.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ static int __init integrity_iintcache_init(void)
		return 0;
		}
		DEFINE_LSM(integrity) = {
		.name = "integrity",
		.init = integrity_iintcache_init,
		};

security/selinux/hooks.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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,
		};

security/smack/smack_lsm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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,
		};