1 files changed, 11 insertions, 3 deletions

diff --git a/security/security.c b/security/security.c
index 2e1f48e8a6f2..b6d3456978a4 100644
--- a/security/security.c
+++ b/security/security.c
@@ -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 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);
         }
 }