]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fs: proc: array.c: fix Speculation_Store_Bypass print format
authorMihai Carabas <mihai.carabas@oracle.com>
Fri, 29 Jun 2018 09:13:41 +0000 (12:13 +0300)
committerBrian Maly <brian.maly@oracle.com>
Wed, 18 Jul 2018 00:18:36 +0000 (20:18 -0400)
This patch fixes commit id f590427c8b01298b416f043107e654918107c579 While
backporting, we introduce a \n in front of Speculation_Store_Bypass ending up
with a suplimentary newline which is affecting different tools (like iotop):
Seccomp:        0

Speculation_Store_Bypass:       thread vulnerable

Orabug: 28128750

Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: John Haxby <john.haxby@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
fs/proc/array.c

index a5cb99d9e84797c1f320ca9aa7745d6c820f4ca1..5972e0e256f84dd0150e2850376b1196e4af826f 100644 (file)
@@ -323,7 +323,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");