net: sched: do not requeue a NULL skb

[firefly-linux-kernel-4.4.55.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index eed2050db9be9c7795acd2153f976d4742e2fe82..b6c00ce0e29e3563037c16fe7bbc754b396f606f 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -91,18 +91,18 @@
 static inline void task_name(struct seq_file *m, struct task_struct *p)
 {
        char *buf;
+       size_t size;
        char tcomm[sizeof(p->comm)];
+       int ret;
 
        get_task_comm(tcomm, p);
 
        seq_puts(m, "Name:\t");
-       buf = m->buf + m->count;
 
-       /* Ignore error for now */
-       buf += string_escape_str(tcomm, buf, m->size - m->count,
-                                ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
+       size = seq_get_buf(m, &buf);
+       ret = string_escape_str(tcomm, buf, size, ESCAPE_SPACE | ESCAPE_SPECIAL, "\n\\");
+       seq_commit(m, ret < size ? ret : -1);
 
-       m->count = buf - m->buf;
        seq_putc(m, '\n');
 }
 
@@ -395,7 +395,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
 
        state = *get_task_state(task);
        vsize = eip = esp = 0;
-       permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
+       permitted = ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS | PTRACE_MODE_NOAUDIT);
        mm = get_task_mm(task);
        if (mm) {
                vsize = task_vsize(mm);