diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 18:44:55 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 18:44:55 +1000 |
| commit | da3f1c7b7d34e66cf571a613525ca0d23f92d42f (patch) | |
| tree | 0233826259cbe4cd44755ccc893b77a3e8ac5213 /security | |
| parent | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (diff) | |
| parent | 25e75dff519bcce2cb35023105e7df51d7b9e691 (diff) | |
| download | op-kernel-dev-da3f1c7b7d34e66cf571a613525ca0d23f92d42f.zip op-kernel-dev-da3f1c7b7d34e66cf571a613525ca0d23f92d42f.tar.gz | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next
Diffstat (limited to 'security')
| -rw-r--r-- | security/apparmor/domain.c | 2 | ||||
| -rw-r--r-- | security/apparmor/lsm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index c825c6e..78adc43 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -73,7 +73,6 @@ static int may_change_ptraced_domain(struct task_struct *task, cred = get_task_cred(tracer); tracerp = aa_cred_profile(cred); } - rcu_read_unlock(); /* not ptraced */ if (!tracer || unconfined(tracerp)) @@ -82,6 +81,7 @@ static int may_change_ptraced_domain(struct task_struct *task, error = aa_may_ptrace(tracer, tracerp, to_profile, PTRACE_MODE_ATTACH); out: + rcu_read_unlock(); if (cred) put_cred(cred); diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 3d2fd14..3783202 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); } |
