aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2013-12-14 11:33:17 -0500
committerPaul Moore <pmoore@redhat.com>2013-12-16 16:00:29 -0500
commit465954cd649a7d8cd331695bd24a16bcb5c4c716 (patch)
tree8c0e5ee5d4073fb24e4b58719488da578cfe49f8 /security
parenta5e333d34037c64c5f667dee3c418b66874ba0b0 (diff)
selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock()
selinux_setprocattr() does ptrace_parent(p) under task_lock(p), but task_struct->alloc_lock doesn't pin ->parent or ->ptrace, this looks confusing and triggers the "suspicious RCU usage" warning because ptrace_parent() does rcu_dereference_check(). And in theory this is wrong, spin_lock()->preempt_disable() doesn't necessarily imply rcu_read_lock() we need to access the ->parent. Reported-by: Evan McNabb <emcnabb@redhat.com> Signed-off-by: Oleg Nesterov <oleg@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index ded2d47e5ee1..6ace9b3abf0d 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5583,11 +5583,11 @@ static int selinux_setprocattr(struct task_struct *p,
5583 /* Check for ptracing, and update the task SID if ok. 5583 /* Check for ptracing, and update the task SID if ok.
5584 Otherwise, leave SID unchanged and fail. */ 5584 Otherwise, leave SID unchanged and fail. */
5585 ptsid = 0; 5585 ptsid = 0;
5586 task_lock(p); 5586 rcu_read_lock();
5587 tracer = ptrace_parent(p); 5587 tracer = ptrace_parent(p);
5588 if (tracer) 5588 if (tracer)
5589 ptsid = task_sid(tracer); 5589 ptsid = task_sid(tracer);
5590 task_unlock(p); 5590 rcu_read_unlock();
5591 5591
5592 if (tracer) { 5592 if (tracer) {
5593 error = avc_has_perm(ptsid, sid, SECCLASS_PROCESS, 5593 error = avc_has_perm(ptsid, sid, SECCLASS_PROCESS,