aboutsummaryrefslogtreecommitdiff
path: root/fs/proc/fd.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2013-09-11 14:24:37 -0700
committerMoyster <oysterized@gmail.com>2016-11-07 13:46:51 +0100
commit1cbc296a04f95f7225295e2ae8ea55b3bfa3eb50 (patch)
tree313e206872327885315079b48f1c30676d175878 /fs/proc/fd.c
parentcdaf836496630a789f4f13406e8719e32da53559 (diff)
UPSTREAM: proc: make proc_fd_permission() thread-friendly
(cherry pick from commit 96d0df79f2644fc823f26c06491e182d87a90c2a) proc_fd_permission() says "process can still access /proc/self/fd after it has executed a setuid()", but the "task_pid() = proc_pid() check only helps if the task is group leader, /proc/self points to /proc/<leader-pid>. Change this check to use task_tgid() so that the whole thread group can access its /proc/self/fd or /proc/<tid-of-sub-thread>/fd. Notes: - CLONE_THREAD does not require CLONE_FILES so task->files can differ, but I don't think this can lead to any security problem. And this matches same_thread_group() in __ptrace_may_access(). - /proc/self should probably point to /proc/<thread-tid>, but it is too late to change the rules. Perhaps it makes sense to add /proc/thread though. Test-case: void *tfunc(void *arg) { assert(opendir("/proc/self/fd")); return NULL; } int main(void) { pthread_t t; pthread_create(&t, NULL, tfunc, NULL); pthread_join(t, NULL); return 0; } fails if, say, this executable is not readable and suid_dumpable = 0. 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> Bug: 26016905 Change-Id: Ifdd6403a8fccd073122e89d3547c13ccc08f0dce
Diffstat (limited to 'fs/proc/fd.c')
-rw-r--r--fs/proc/fd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index d7a4a28ef..50ac26b31 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -305,7 +305,7 @@ int proc_fd_permission(struct inode *inode, int mask)
int rv = generic_permission(inode, mask);
if (rv == 0)
return 0;
- if (task_pid(current) == proc_pid(inode))
+ if (task_tgid(current) == proc_pid(inode))
rv = 0;
return rv;
}