Merge branch 'kcsan.2021.05.18a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / proc / fd.c

diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 07fc4fa..172c862 100644 (file)
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -6,6 +6,7 @@
 #include <linux/fdtable.h>
 #include <linux/namei.h>
 #include <linux/pid.h>
+#include <linux/ptrace.h>
 #include <linux/security.h>
 #include <linux/file.h>
 #include <linux/seq_file.h>
@@ -53,9 +54,10 @@ static int seq_show(struct seq_file *m, void *v)
        if (ret)
                return ret;
 
-       seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\n",
+       seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\nino:\t%lu\n",
                   (long long)file->f_pos, f_flags,
-                  real_mount(file->f_path.mnt)->mnt_id);
+                  real_mount(file->f_path.mnt)->mnt_id,
+                  file_inode(file)->i_ino);
 
        /* show_fd_locks() never deferences files so a stale value is safe */
        show_fd_locks(m, file, files);
@@ -72,6 +74,18 @@ out:
 
 static int seq_fdinfo_open(struct inode *inode, struct file *file)
 {
+       bool allowed = false;
+       struct task_struct *task = get_proc_task(inode);
+
+       if (!task)
+               return -ESRCH;
+
+       allowed = ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS);
+       put_task_struct(task);
+
+       if (!allowed)
+               return -EACCES;
+
        return single_open(file, seq_show, inode);
 }
 
@@ -308,7 +322,7 @@ static struct dentry *proc_fdinfo_instantiate(struct dentry *dentry,
        struct proc_inode *ei;
        struct inode *inode;
 
-       inode = proc_pid_make_inode(dentry->d_sb, task, S_IFREG | S_IRUSR);
+       inode = proc_pid_make_inode(dentry->d_sb, task, S_IFREG | S_IRUGO);
        if (!inode)
                return ERR_PTR(-ENOENT);