---

yaml --- r: 260931 b: refs/heads/master c: 25e75df h: refs/heads/master i: 260929: d806434 260927: bd72944 v: v3
git-mirror · Jun 29, 2011 · 2f553b1 · 2f553b1
1 parent 97a30ad
commit 2f553b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04fdc099f9c80c7775dbac388fc97e156d4d47e7
+refs/heads/master: 25e75dff519bcce2cb35023105e7df51d7b9e691
diff --git a/trunk/security/apparmor/lsm.c b/trunk/security/apparmor/lsm.c
@@ -127,7 +127,7 @@ static int apparmor_capget(struct task_struct *target, kernel_cap_t *effective,
 	*inheritable = cred->cap_inheritable;
 	*permitted = cred->cap_permitted;
 
-	if (!unconfined(profile)) {
+	if (!unconfined(profile) && !COMPLAIN_MODE(profile)) {
 		*effective = cap_intersect(*effective, profile->caps.allow);
 		*permitted = cap_intersect(*permitted, profile->caps.allow);
 	}