path: root/security
diff options
authorJohn Johansen <john.johansen@canonical.com>2011-06-25 16:57:07 +0100
committerJohn Johansen <john.johansen@canonical.com>2011-06-29 02:04:44 +0100
commit25e75dff519bcce2cb35023105e7df51d7b9e691 (patch)
tree14cb61f6510af1440782fc5f3a81e37aad0c4be5 /security
parent04fdc099f9c80c7775dbac388fc97e156d4d47e7 (diff)
AppArmor: Fix masking of capabilities in complain mode
AppArmor is masking the capabilities returned by capget against the capabilities mask in the profile. This is wrong, in complain mode the profile has effectively all capabilities, as the profile restrictions are not being enforced, merely tested against to determine if an access is known by the profile. This can result in the wrong behavior of security conscience applications like sshd which examine their capability set, and change their behavior accordingly. In this case because of the masked capability set being returned sshd fails due to DAC checks, even when the profile is in complain mode. Kernels affected: 2.6.36 - 3.0. Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security')
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 3d2fd141dff..37832026e58 100644
--- a/security/apparmor/lsm.c
+++ b/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);