From: Stefan Bader <stefan.bader@canonical.com>
Date: Wed, 22 Mar 2017 08:49:54 +0000 (+0100)
Subject: Revert "UBUNTU: SAUCE: apparmor: fix ns ref count link when removing profiles from... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1055.59~608
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2885617fdc0a542b4cb2b8122d6365aa4d8429a4;p=mirror_ubuntu-zesty-kernel.git

Revert "UBUNTU: SAUCE: apparmor: fix ns ref count link when removing profiles from policy"

This reverts commit d8028df720da410ab8f313bbaa6f389e43a08727.

BugLink: https://bugs.launchpad.net/bugs/1666897

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index f2ffcf109e28..afa5984d91b8 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -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);