1 files changed, 65 insertions, 43 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 54e270262979..29fd7ef97be9 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -400,23 +400,6 @@ static const struct file_operations proc_pid_cmdline_ops = {
         .llseek = generic_file_llseek,
 };
 
-static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
-                         struct pid *pid, struct task_struct *task)
-{
-        struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);
-        if (mm && !IS_ERR(mm)) {
-                unsigned int nwords = 0;
-                do {
-                        nwords += 2;
-                } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-                seq_write(m, mm->saved_auxv, nwords * sizeof(mm->saved_auxv[0]));
-                mmput(mm);
-                return 0;
-        } else
-                return PTR_ERR(mm);
-}
-
-
 #ifdef CONFIG_KALLSYMS
 /*
  * Provides a wchan file via kallsyms in a proper one-value-per-file format.
@@ -483,7 +466,7 @@ static int proc_pid_stack(struct seq_file *m, struct pid_namespace *ns,
                 save_stack_trace_tsk(task, &trace);
 
                 for (i = 0; i < trace.nr_entries; i++) {
-                        seq_printf(m, "[<%pK>] %pS\n",
+                        seq_printf(m, "[<%pK>] %pB\n",
                                    (void *)entries[i], (void *)entries[i]);
                 }
                 unlock_trace(task);
@@ -709,7 +692,7 @@ int proc_setattr(struct dentry *dentry, struct iattr *attr)
         if (attr->ia_valid & ATTR_MODE)
                 return -EPERM;
 
-        error = inode_change_ok(inode, attr);
+        error = setattr_prepare(dentry, attr);
         if (error)
                 return error;
 
@@ -1014,6 +997,30 @@ static const struct file_operations proc_environ_operations = {
         .release        = mem_release,
 };
 
+static int auxv_open(struct inode *inode, struct file *file)
+{
+        return __mem_open(inode, file, PTRACE_MODE_READ_FSCREDS);
+}
+
+static ssize_t auxv_read(struct file *file, char __user *buf,
+                        size_t count, loff_t *ppos)
+{
+        struct mm_struct *mm = file->private_data;
+        unsigned int nwords = 0;
+        do {
+                nwords += 2;
+        } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
+        return simple_read_from_buffer(buf, count, ppos, mm->saved_auxv,
+                                       nwords * sizeof(mm->saved_auxv[0]));
+}
+
+static const struct file_operations proc_auxv_operations = {
+        .open           = auxv_open,
+        .read           = auxv_read,
+        .llseek         = generic_file_llseek,
+        .release        = mem_release,
+};
+
 static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count,
                             loff_t *ppos)
 {
@@ -1556,18 +1563,13 @@ static const struct file_operations proc_pid_set_comm_operations = {
 static int proc_exe_link(struct dentry *dentry, struct path *exe_path)
 {
         struct task_struct *task;
-        struct mm_struct *mm;
         struct file *exe_file;
 
         task = get_proc_task(d_inode(dentry));
         if (!task)
                 return -ENOENT;
-        mm = get_task_mm(task);
+        exe_file = get_task_exe_file(task);
         put_task_struct(task);
-        if (!mm)
-                return -ENOENT;
-        exe_file = get_mm_exe_file(mm);
-        mmput(mm);
         if (exe_file) {
                 *exe_path = exe_file->f_path;
                 path_get(&exe_file->f_path);
@@ -2285,16 +2287,27 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,
         if (!p)
                 return -ESRCH;
 
-        if (ptrace_may_access(p, PTRACE_MODE_ATTACH_FSCREDS)) {
-                task_lock(p);
-                if (slack_ns == 0)
-                        p->timer_slack_ns = p->default_timer_slack_ns;
-                else
-                        p->timer_slack_ns = slack_ns;
-                task_unlock(p);
-        } else
-                count = -EPERM;
+        if (p != current) {
+                if (!capable(CAP_SYS_NICE)) {
+                        count = -EPERM;
+                        goto out;
+                }
+
+                err = security_task_setscheduler(p);
+                if (err) {
+                        count = err;
+                        goto out;
+                }
+        }
+
+        task_lock(p);
+        if (slack_ns == 0)
+                p->timer_slack_ns = p->default_timer_slack_ns;
+        else
+                p->timer_slack_ns = slack_ns;
+        task_unlock(p);
 
+out:
         put_task_struct(p);
 
         return count;
@@ -2304,19 +2317,28 @@ static int timerslack_ns_show(struct seq_file *m, void *v)
 {
         struct inode *inode = m->private;
         struct task_struct *p;
-        int err =  0;
+        int err = 0;
 
         p = get_proc_task(inode);
         if (!p)
                 return -ESRCH;
 
-        if (ptrace_may_access(p, PTRACE_MODE_ATTACH_FSCREDS)) {
-                task_lock(p);
-                seq_printf(m, "%llu\n", p->timer_slack_ns);
-                task_unlock(p);
-        } else
-                err = -EPERM;
+        if (p != current) {
 
+                if (!capable(CAP_SYS_NICE)) {
+                        err = -EPERM;
+                        goto out;
+                }
+                err = security_task_getscheduler(p);
+                if (err)
+                        goto out;
+        }
+
+        task_lock(p);
+        seq_printf(m, "%llu\n", p->timer_slack_ns);
+        task_unlock(p);
+
+out:
         put_task_struct(p);
 
         return err;
@@ -2827,7 +2849,7 @@ static const struct pid_entry tgid_base_stuff[] = {
         DIR("net",        S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),
 #endif
         REG("environ",    S_IRUSR, proc_environ_operations),
-        ONE("auxv",       S_IRUSR, proc_pid_auxv),
+        REG("auxv",       S_IRUSR, proc_auxv_operations),
         ONE("status",     S_IRUGO, proc_pid_status),
         ONE("personality", S_IRUSR, proc_pid_personality),
         ONE("limits",     S_IRUGO, proc_pid_limits),
@@ -3215,7 +3237,7 @@ static const struct pid_entry tid_base_stuff[] = {
         DIR("net",        S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),
 #endif
         REG("environ",   S_IRUSR, proc_environ_operations),
-        ONE("auxv",      S_IRUSR, proc_pid_auxv),
+        REG("auxv",      S_IRUSR, proc_auxv_operations),
         ONE("status",    S_IRUGO, proc_pid_status),
         ONE("personality", S_IRUSR, proc_pid_personality),
         ONE("limits",    S_IRUGO, proc_pid_limits),