1 files changed, 11 insertions, 33 deletions

diff --git a/fs/proc/array.c b/fs/proc/array.c
index bd117d065b82..1295a00ca316 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -81,6 +81,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/ptrace.h>
 #include <linux/tracehook.h>
+#include <linux/string_helpers.h>
 #include <linux/user_namespace.h>
 
 #include <asm/pgtable.h>
@@ -89,39 +90,18 @@
 
 static inline void task_name(struct seq_file *m, struct task_struct *p)
 {
-        int i;
-        char *buf, *end;
-        char *name;
+        char *buf;
         char tcomm[sizeof(p->comm)];
 
         get_task_comm(tcomm, p);
 
         seq_puts(m, "Name:\t");
-        end = m->buf + m->size;
         buf = m->buf + m->count;
-        name = tcomm;
-        i = sizeof(tcomm);
-        while (i && (buf < end)) {
-                unsigned char c = *name;
-                name++;
-                i--;
-                *buf = c;
-                if (!c)
-                        break;
-                if (c == '\\') {
-                        buf++;
-                        if (buf < end)
-                                *buf++ = c;
-                        continue;
-                }
-                if (c == '\n') {
-                        *buf++ = '\\';
-                        if (buf < end)
-                                *buf++ = 'n';
-                        continue;
-                }
-                buf++;
-        }
+
+        /* Ignore error for now */
+        string_escape_str(tcomm, &buf, m->size - m->count,
+                          ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
+
         m->count = buf - m->buf;
         seq_putc(m, '\n');
 }
@@ -336,12 +316,10 @@ static inline void task_context_switch_counts(struct seq_file *m,
 
 static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
 {
-        seq_puts(m, "Cpus_allowed:\t");
-        seq_cpumask(m, &task->cpus_allowed);
-        seq_putc(m, '\n');
-        seq_puts(m, "Cpus_allowed_list:\t");
-        seq_cpumask_list(m, &task->cpus_allowed);
-        seq_putc(m, '\n');
+        seq_printf(m, "Cpus_allowed:\t%*pb\n",
+                   cpumask_pr_args(&task->cpus_allowed));
+        seq_printf(m, "Cpus_allowed_list:\t%*pbl\n",
+                   cpumask_pr_args(&task->cpus_allowed));
 }
 
 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,