UBUNTU: SAUCE: LSM stacking: fixup apparmor stacking enablement

AppArmor doesn't need to register twice.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 127655953ab7ad9313eec242e8ec0165e4c8442c..792264c0ae1d8cf7c0da474fb0fd3545d9fdbe3f 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1566,9 +1566,7 @@ static int __init apparmor_init(void)
                return 0;
        }
 
-       if (!apparmor_enabled ||
-           !security_module_enable("apparmor",
-                               IS_ENABLED(CONFIG_SECURITY_APPARMOR_STACKED))) {
+       if (!apparmor_enabled) {
                aa_info_message("AppArmor disabled by boot time parameter");
                apparmor_enabled = 0;
                return 0;