proc: actually make proc_fd_permission() thread-friendly
Oleg Nesterov [Thu, 22 Sep 2016 09:03:03 +0000 (14:03 +0530)]
The commit 96d0df79f264 ("proc: make proc_fd_permission() thread-friendly")
fixed the access to /proc/self/fd from sub-threads, but introduced another
problem: a sub-thread can't access /proc/<tid>/fd/ or /proc/thread-self/fd
if generic_permission() fails.
Change proc_fd_permission() to check same_thread_group(pid_task(), current).

Bug 200237562

Change-Id: Id8e5c879305865062d8f0cce9887168a3193390d
Fixes: 96d0df79f264 ("proc: make proc_fd_permission() thread-friendly")
Reported-by: "Jin, Yihua" <yihua.jin@intel.com>
commit 54708d2858e79a2bdda10bf8a20c80eb96c20613
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Vaibhav Shinde <vashinde@nvidia.com>
Reviewed-on: http://git-master/r/1225094
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

fs/proc/fd.c

index 50ac26b..d8eda97 100644 (file)
@@ -302,11 +302,19 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
  */
 int proc_fd_permission(struct inode *inode, int mask)
 {
-       int rv = generic_permission(inode, mask);
+       struct task_struct *p;
+       int rv;
+
+       rv = generic_permission(inode, mask);
        if (rv == 0)
-               return 0;
-       if (task_tgid(current) == proc_pid(inode))
+               return rv;
+
+       rcu_read_lock();
+       p = pid_task(proc_pid(inode), PIDTYPE_PID);
+       if (p && same_thread_group(p, current))
                rv = 0;
+       rcu_read_unlock();
+
        return rv;
 }