OSDN Git Service

proc: Remove empty line in /proc/self/status
authorGwendal Grignou <gwendal@chromium.org>
Mon, 14 Jan 2019 18:13:36 +0000 (10:13 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Jan 2019 08:42:49 +0000 (09:42 +0100)
Prevent an empty line in /proc/self/status, allow iotop to work.

iotop does not like empty lines, fails with:
  File "/usr/local/lib64/python2.7/site-packages/iotop/data.py", line
196, in parse_proc_pid_status
    key, value = line.split(':\t', 1)
ValueError: need more than 1 value to unpack

[reading /proc/self/status]

Fixes: 84964fa3e5a0 ("proc: Provide details on speculation flaw mitigations")
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/proc/array.c

index cb71cba..60cbaa8 100644 (file)
@@ -333,7 +333,7 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)
 #ifdef CONFIG_SECCOMP
        seq_printf(m, "Seccomp:\t%d\n", p->seccomp.mode);
 #endif
-       seq_printf(m, "\nSpeculation_Store_Bypass:\t");
+       seq_printf(m, "Speculation_Store_Bypass:\t");
        switch (arch_prctl_spec_ctrl_get(p, PR_SPEC_STORE_BYPASS)) {
        case -EINVAL:
                seq_printf(m, "unknown");