summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Grondona <mgrondona@llnl.gov>2013-09-11 14:24:31 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-07-03 19:48:08 -0700
commita20cc70d1e37617c25c336ec036186d369946765 (patch)
treec74cbc2693b285bb657874d9b078e75f7674d27c
parent434c32f798d372fbeff6258a1178dbeb41d960d4 (diff)
downloadlinux-stable-a20cc70d1e37617c25c336ec036186d369946765.tar.gz
linux-stable-a20cc70d1e37617c25c336ec036186d369946765.tar.bz2
linux-stable-a20cc70d1e37617c25c336ec036186d369946765.zip
__ptrace_may_access() should not deny sub-threads
commit 73af963f9f3036dffed55c3a2898598186db1045 upstream. __ptrace_may_access() checks get_dumpable/ptrace_has_cap/etc if task != current, this can can lead to surprising results. For example, a sub-thread can't readlink("/proc/self/exe") if the executable is not readable. setup_new_exec()->would_dump() notices that inode_permission(MAY_READ) fails and then it does set_dumpable(suid_dumpable). After that get_dumpable() fails. (It is not clear why proc_pid_readlink() checks get_dumpable(), perhaps we could add PTRACE_MODE_NODUMPABLE) Change __ptrace_may_access() to use same_thread_group() instead of "task == current". Any security check is pointless when the tasks share the same ->mm. Signed-off-by: Mark Grondona <mgrondona@llnl.gov> Signed-off-by: Ben Woodard <woodard@redhat.com> Signed-off-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 118323bc8529..30ab20623bca 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -236,7 +236,7 @@ static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
*/
int dumpable = 0;
/* Don't let security modules deny introspection */
- if (task == current)
+ if (same_thread_group(task, current))
return 0;
rcu_read_lock();
tcred = __task_cred(task);