From 351a32f63a56d27ae4def4dad8f871508f6ec438 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 18 Jan 2019 17:11:14 +0100 Subject: [PATCH] 4.4-stable patches added patches: proc-remove-empty-line-in-proc-self-status.patch --- ...emove-empty-line-in-proc-self-status.patch | 41 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-4.4/proc-remove-empty-line-in-proc-self-status.patch diff --git a/queue-4.4/proc-remove-empty-line-in-proc-self-status.patch b/queue-4.4/proc-remove-empty-line-in-proc-self-status.patch new file mode 100644 index 00000000000..9424e6042bc --- /dev/null +++ b/queue-4.4/proc-remove-empty-line-in-proc-self-status.patch @@ -0,0 +1,41 @@ +From gwendal@chromium.org Fri Jan 18 17:10:02 2019 +From: Gwendal Grignou +Date: Mon, 14 Jan 2019 10:13:36 -0800 +Subject: proc: Remove empty line in /proc/self/status +To: gregkh@linuxfoundation.org +Cc: stable@vger.kernel.org, groeck@chromium.org, keescook@chromium.org +Message-ID: <20190114181336.74501-1-gwendal@chromium.org> + +From: Gwendal Grignou + +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 +Signed-off-by: Greg Kroah-Hartman +--- + v2: Format commit message properly with proper subject and fixes + keyword. + + fs/proc/array.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/proc/array.c ++++ b/fs/proc/array.c +@@ -333,7 +333,7 @@ static inline void task_seccomp(struct s + #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"); diff --git a/queue-4.4/series b/queue-4.4/series index 9d747f79039..e279047bb6e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -36,3 +36,4 @@ f2fs-fix-invalid-memory-access.patch f2fs-fix-missing-up_read.patch f2fs-fix-validation-of-the-block-count-in-sanity_check_raw_super.patch media-em28xx-fix-misplaced-reset-of-dev-v4l-field_count.patch +proc-remove-empty-line-in-proc-self-status.patch -- 2.47.2