LSM: Tie enabling logic to presence in ordered list (a8027fb0) · Commits · 戴 / test

include/linux/lsm_hooks.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -2047,7 +2047,7 @@ extern void security_add_hooks(struct security_hook_list *hooks, int count,
		struct lsm_info {
		const char name; / Required. */
		unsigned long flags; /* Optional: flags describing LSM */
		int enabled; / Optional: NULL means enabled. */
		int enabled; / Optional: controlled by CONFIG_LSM */
		int (init)(void); / Required. */
		};

+11 −3

Original line number	Diff line number	Diff line
		@@ -63,10 +63,10 @@ static __initdata bool debug;

		static bool __init is_enabled(struct lsm_info *lsm)
		{
		if (!lsm->enabled \|\| *lsm->enabled)
		return true;

		if (!lsm->enabled)
		return false;

		return *lsm->enabled;
		}

		/* Mark an LSM's enabled flag. */
		@@ -117,7 +117,11 @@ static void __init append_ordered_lsm(struct lsm_info lsm, const char from)
		if (WARN(last_lsm == LSM_COUNT, "%s: out of LSM slots!?\n", from))
		return;

		/* Enable this LSM, if it is not already set. */
		if (!lsm->enabled)
		lsm->enabled = &lsm_enabled_true;
		ordered_lsms[last_lsm++] = lsm;

		init_debug("%s ordering: %s (%sabled)\n", from, lsm->name,
		is_enabled(lsm) ? "en" : "dis");
		}
		@@ -210,6 +214,10 @@ static void __init major_lsm_init(void)
		if ((lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0)
		continue;

		/* Enable this LSM, if it is not already set. */
		if (!lsm->enabled)
		lsm->enabled = &lsm_enabled_true;

		maybe_initialize_lsm(lsm);
		}
		}