diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2013-12-14 17:33:17 +0100 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2013-12-16 16:00:29 -0500 |
| commit | 465954cd649a7d8cd331695bd24a16bcb5c4c716 (patch) | |
| tree | 8c0e5ee5d4073fb24e4b58719488da578cfe49f8 /security | |
| parent | a5e333d34037c64c5f667dee3c418b66874ba0b0 (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ded2d47e5ee..6ace9b3abf0 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -5583,11 +5583,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, |