UBUNTU: SAUCE: Revert "apparmor: Fix memory leak of rule on error exit path"

Revert currently unused by Ubuntu apparmor features that require secid
support, to enable apparmor LSM stacking with the 5.1 LSM stacking
patchset.

This reverts commit 52e8c38001d8ef0ca07ef428e480cd4a35e46abf.

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

diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 5a98661a8b46ea2daf47a3386d2fe181622a977b..966e796459fe2709669dc00408dee61fb1359609 100644 (file)
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -196,12 +196,10 @@ int aa_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule)
        /* Currently rules are treated as coming from the root ns */
        rule->label = aa_label_parse(&root_ns->unconfined->label, rulestr,
                                     GFP_KERNEL, true, false);
-       if (IS_ERR(rule->label)) {
-               aa_audit_rule_free(rule);
+       if (IS_ERR(rule->label))
                return PTR_ERR(rule->label);
-       }
-
        *vrule = rule;
+
        return 0;
 }