diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:08:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:08:17 -0700 |
| commit | a6667d2dab4fa9b8a91b63dc94195bc723388620 (patch) | |
| tree | e85a369c35917868f46cbebe00691c00f811f185 /security | |
| parent | 6584543c5cc44809ba380c2ff1b31d578de78302 (diff) | |
| parent | 9abd59b0df155835a970c2b9c8f93367eb793797 (diff) | |
| download | kernel_samsung_espresso10-a6667d2dab4fa9b8a91b63dc94195bc723388620.zip kernel_samsung_espresso10-a6667d2dab4fa9b8a91b63dc94195bc723388620.tar.gz kernel_samsung_espresso10-a6667d2dab4fa9b8a91b63dc94195bc723388620.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
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); } |