UBUNTU: SAUCE: LSM stacking: fixup apparmor stacking enablement

BugLink: http://bugs.launchpad.net/bugs/1763062
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 d7fa61ab8d642de5705f0a627221b122a008a3cf..92721e944ddd60b441f5d83840bdb029e8ad179c 100644 (file)
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1539,9 +1539,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 = false;
                return 0;