]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Revert "UBUNTU: SAUCE: apparmor: fix ns ref count link when removing profiles from...
authorStefan Bader <stefan.bader@canonical.com>
Wed, 22 Mar 2017 08:49:54 +0000 (09:49 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 22 Mar 2017 10:20:12 +0000 (11:20 +0100)
This reverts commit d8028df720da410ab8f313bbaa6f389e43a08727.

BugLink: https://bugs.launchpad.net/bugs/1666897
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
security/apparmor/policy.c

index f2ffcf109e28b0efd8cd2fa66f53a5e723657e62..afa5984d91b892bbafbb7b87e31b1b16125d6859 100644 (file)
@@ -1104,13 +1104,11 @@ ssize_t aa_remove_profiles(struct aa_ns *view, struct aa_label *label,
 
        /* don't fail removal if audit fails */
        (void) audit_policy(label, OP_PROF_RM, ns_name, name, info, error);
-       aa_put_ns(ns);
        aa_put_profile(profile);
        return size;
 
 fail_ns_lock:
        mutex_unlock(&ns->lock);
-       aa_put_ns(ns);
 
 fail:
        (void) audit_policy(label, OP_PROF_RM, ns_name, name, info, error);