Patchwork [2/3] UBUNTU: [Upstream] AppArmor: Fix locking from removal of profile namespace

login
register
mail settings
Submitter John Johansen
Date Sept. 15, 2010, 5:16 p.m.
Message ID <1284570966-6603-3-git-send-email-john.johansen@canonical.com>
Download mbox | patch
Permalink /patch/64855/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

John Johansen - Sept. 15, 2010, 5:16 p.m.
BugLink: http://bugs.launchpad.net/bugs/615947
upstream commit: 74b1f2cea78bcb3dc084148cbcdff63de8fafd6e

The locking for profile namespace removal is wrong, when removing a
profile namespace, it needs to be removed from its parent's list.
Lock the parent of namespace list instead of the namespace being removed.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
---
 security/apparmor/policy.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Patch

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index e3020ed..3b5da44 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -1152,12 +1152,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;
@@ -1166,8 +1168,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);