]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock()
authorOleg Nesterov <oleg@redhat.com>
Mon, 23 Dec 2013 22:45:01 +0000 (17:45 -0500)
committerPaul Moore <pmoore@redhat.com>
Mon, 23 Dec 2013 22:45:17 +0000 (17:45 -0500)
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>
security/selinux/hooks.c

index 5db26468b5c392d3e90f1564287dc0e1cebeef3b..6625699f497c7f3889f7b82b325a315c9e51774a 100644 (file)
@@ -5588,11 +5588,11 @@ static int selinux_setprocattr(struct task_struct *p,
                /* Check for ptracing, and update the task SID if ok.
                   Otherwise, leave SID unchanged and fail. */
                ptsid = 0;
-               task_lock(p);
+               rcu_read_lock();
                tracer = ptrace_parent(p);
                if (tracer)
                        ptsid = task_sid(tracer);
-               task_unlock(p);
+               rcu_read_unlock();
 
                if (tracer) {
                        error = avc_has_perm(ptsid, sid, SECCLASS_PROCESS,