aboutsummaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2011-06-28 15:06:38 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:41 -0700
commit0635a74b4ab037ed0c6d628d9cc737b949a15731 (patch)
tree68ad93832badef6bd961831f9d36a603bc6e1678 /security/apparmor
parente73ff29041b5f8991ef81669a1a9f0553d14766a (diff)
downloadkernel_samsung_smdk4412-0635a74b4ab037ed0c6d628d9cc737b949a15731.tar.gz
kernel_samsung_smdk4412-0635a74b4ab037ed0c6d628d9cc737b949a15731.tar.bz2
kernel_samsung_smdk4412-0635a74b4ab037ed0c6d628d9cc737b949a15731.zip
AppArmor: Fix reference to rcu protected pointer outside of rcu_read_lock
commit 04fdc099f9c80c7775dbac388fc97e156d4d47e7 upstream. The pointer returned from tracehook_tracer_task() is only valid inside the rcu_read_lock. However the tracer pointer obtained is being passed to aa_may_ptrace outside of the rcu_read_lock critical section. Mover the aa_may_ptrace test into the rcu_read_lock critical section, to fix this. Kernels affected: 2.6.36 - 3.0 Reported-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/domain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index c825c6e0b63..78adc4303ef 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);