stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Guenter Roeck <groeck@google.com>
To: Gwendal Grignou <gwendal@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	"# v4 . 10+" <stable@vger.kernel.org>,
	Guenter Roeck <groeck@chromium.org>,
	Kees Cook <keescook@chromium.org>
Subject: Re: [PATCH v2] proc: Remove empty line in /proc/self/status
Date: Mon, 14 Jan 2019 10:21:45 -0800	[thread overview]
Message-ID: <CABXOdTe40-mXDMGHWy9xwU0YQ+CVOMoKDgfnH--vDtWWiwQ99w@mail.gmail.com> (raw)
In-Reply-To: <20190114181336.74501-1-gwendal@chromium.org>

On Mon, Jan 14, 2019 at 10:13 AM Gwendal Grignou <gwendal@chromium.org> wrote:
>
> 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>
> ---
>  v2: Format commit message properly with proper subject and fixes
>      keyword.
>
You might want to mention that this patch only applies to v4.4.y.
v4.9.y has a similar problem, but only if CONFIG_SECCOMP=n, and would
require a slightly different patch to fix. Other releases are, as far
as I can see, not affected.

Guenter

>  fs/proc/array.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/proc/array.c b/fs/proc/array.c
> index 0c142916a8c7d..f11df9ab4256e 100644
> --- a/fs/proc/array.c
> +++ b/fs/proc/array.c
> @@ -334,7 +334,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");
> --
> 2.20.1.97.g81188d93c3-goog
>

  reply	other threads:[~2019-01-14 18:21 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-12  0:32 [PATCH] FIXUP: proc: Provide details on speculation flaw mitigations Gwendal Grignou
2019-01-12  8:01 ` Greg KH
2019-01-14 18:00   ` Gwendal Grignou
2019-01-14 18:13     ` [PATCH v2] proc: Remove empty line in /proc/self/status Gwendal Grignou
2019-01-14 18:21       ` Guenter Roeck [this message]
2019-01-14 18:50         ` Greg Kroah-Hartman
2019-01-14 19:01           ` Guenter Roeck
2019-01-14 19:05             ` Kees Cook
2019-01-16 16:06               ` Guenter Roeck
2019-01-16 17:00                 ` Kees Cook
2019-01-16 17:16                   ` Guenter Roeck
2019-01-18 16:10       ` Greg KH
2019-01-14 18:49     ` [PATCH] FIXUP: proc: Provide details on speculation flaw mitigations Greg KH
2019-01-14 21:36       ` Gwendal Grignou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CABXOdTe40-mXDMGHWy9xwU0YQ+CVOMoKDgfnH--vDtWWiwQ99w@mail.gmail.com \
    --to=groeck@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=groeck@chromium.org \
    --cc=gwendal@chromium.org \
    --cc=keescook@chromium.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).