diff options
| -rw-r--r-- | security/lsm_init.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/security/lsm_init.c b/security/lsm_init.c index 9bfc35b44b63..4b66a8cfe8eb 100644 --- a/security/lsm_init.c +++ b/security/lsm_init.c @@ -108,8 +108,11 @@ static inline bool lsm_is_enabled(struct lsm_info *lsm) return (lsm->enabled ? *lsm->enabled : false); } -/* Is an LSM already listed in the ordered LSMs list? */ -static bool __init exists_ordered_lsm(struct lsm_info *lsm) +/** + * lsm_order_exists - Determine if a LSM exists in the ordered list + * @lsm: LSM definition + */ +static bool __init lsm_order_exists(struct lsm_info *lsm) { struct lsm_info **check; @@ -126,7 +129,7 @@ static int last_lsm __initdata; static void __init append_ordered_lsm(struct lsm_info *lsm, const char *from) { /* Ignore duplicate selections. */ - if (exists_ordered_lsm(lsm)) + if (lsm_order_exists(lsm)) return; if (WARN(last_lsm == MAX_LSM_COUNT, "%s: out of LSM static calls!?\n", from)) @@ -269,7 +272,7 @@ static void __init ordered_lsm_parse(const char *order, const char *origin) /* Process "security=", if given. */ if (lsm_order_legacy) { lsm_for_each_raw(lsm) { - if (exists_ordered_lsm(lsm)) + if (lsm_order_exists(lsm)) continue; if (strcmp(lsm->id->name, lsm_order_legacy) == 0) append_ordered_lsm(lsm, "security="); @@ -284,7 +287,7 @@ static void __init ordered_lsm_parse(const char *order, const char *origin) /* Disable all LSMs not in the ordered list. */ lsm_for_each_raw(lsm) { - if (exists_ordered_lsm(lsm)) + if (lsm_order_exists(lsm)) continue; lsm_enabled_set(lsm, false); init_debug("%s skipped: %s (not in requested order)\n", |