1 files changed, 13 insertions, 5 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index d7fd1ca807d2..633a63462573 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -581,8 +581,10 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
         /*
          * print the file header
          */
-       seq_printf(m, "%-25s %-20s %-20s %-10s\n",
-                  "Limit", "Soft Limit", "Hard Limit", "Units");
+        seq_puts(m, "Limit                     "
+                "Soft Limit           "
+                "Hard Limit           "
+                "Units     \n");
 
         for (i = 0; i < RLIM_NLIMITS; i++) {
                 if (rlim[i].rlim_cur == RLIM_INFINITY)
@@ -2356,10 +2358,13 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,
                 return -ESRCH;
 
         if (p != current) {
-                if (!capable(CAP_SYS_NICE)) {
+                rcu_read_lock();
+                if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
+                        rcu_read_unlock();
                         count = -EPERM;
                         goto out;
                 }
+                rcu_read_unlock();
 
                 err = security_task_setscheduler(p);
                 if (err) {
@@ -2392,11 +2397,14 @@ static int timerslack_ns_show(struct seq_file *m, void *v)
                 return -ESRCH;
 
         if (p != current) {
-
-                if (!capable(CAP_SYS_NICE)) {
+                rcu_read_lock();
+                if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
+                        rcu_read_unlock();
                         err = -EPERM;
                         goto out;
                 }
+                rcu_read_unlock();
+
                 err = security_task_getscheduler(p);
                 if (err)
                         goto out;