diff --git a/[refs] b/[refs]
index 411ca5616ea0..f975b6d7595f 100644
--- 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
index 3d2fd141dff7..37832026e58a 100644
--- 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);
 	}