From 021a1d3901e1ca18c24137d3324ad63ca769b016 Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Fri, 27 Aug 2010 18:33:29 -0700
Subject: [PATCH] --- yaml --- r: 210342 b: refs/heads/master c:
 999b4f0aa2314b76857775334cb94bafa053db64 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/security/apparmor/policy.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 85df28d2acae..29160a311db0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04ccd53f09741c4bc54ab36db000bc1383e4812e
+refs/heads/master: 999b4f0aa2314b76857775334cb94bafa053db64
diff --git a/trunk/security/apparmor/policy.c b/trunk/security/apparmor/policy.c
index 3cdc1ad0787e..52cc865f1464 100644
--- a/trunk/security/apparmor/policy.c
+++ b/trunk/security/apparmor/policy.c
@@ -1151,12 +1151,14 @@ ssize_t aa_remove_profiles(char *fqname, size_t size)
 		/* released below */
 		ns = aa_get_namespace(root);
 
-	write_lock(&ns->lock);
 	if (!name) {
 		/* remove namespace - can only happen if fqname[0] == ':' */
+		write_lock(&ns->parent->lock);
 		__remove_namespace(ns);
+		write_unlock(&ns->parent->lock);
 	} else {
 		/* remove profile */
+		write_lock(&ns->lock);
 		profile = aa_get_profile(__lookup_profile(&ns->base, name));
 		if (!profile) {
 			error = -ENOENT;
@@ -1165,8 +1167,8 @@ ssize_t aa_remove_profiles(char *fqname, size_t size)
 		}
 		name = profile->base.hname;
 		__remove_profile(profile);
+		write_unlock(&ns->lock);
 	}
-	write_unlock(&ns->lock);
 
 	/* don't fail removal if audit fails */
 	(void) audit_policy(OP_PROF_RM, GFP_KERNEL, name, info, error);