From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16CA2C43612 for ; Sat, 12 Jan 2019 00:32:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D5F362084E for ; Sat, 12 Jan 2019 00:32:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="rvry/zK0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726374AbfALAcV (ORCPT ); Fri, 11 Jan 2019 19:32:21 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45252 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726217AbfALAcV (ORCPT ); Fri, 11 Jan 2019 19:32:21 -0500 Received: by mail-pg1-f195.google.com with SMTP id y4so6980901pgc.12 for ; Fri, 11 Jan 2019 16:32:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tlt3P7tJF8hfbOWwiQ+kV0YKhZquP0t0JCFqJw+JXZY=; b=rvry/zK0lp33cuK4fabZ1085ioeOz5zVokpVC6Vubk/O99sE9hASH+C01oWXUjGAXU iT8xH6g7h8Xqg5ys2/T5p2P+ycljwlvISEk2tY3W3GAz5JPmfaH8YX+3ImicTGtBKra8 nQPD2ag85vSwJ0rzmq3gxFmVldzuj/RycmtePmQVVebuxIGT4KWKxriEaDL9igW3Mf9w TUZO4WF+F0cgpJEFte1wLqumYX0UVtsJtWgk+ZPrytHqg62D/t2imStPXq3PAGBQx+K+ tC+yF4qvXQlSdgZ90hGK9HK5SkkK1PXL7RglVciZaelVzYv8ii1uu1z2sr8QsBfl30ip COHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Tlt3P7tJF8hfbOWwiQ+kV0YKhZquP0t0JCFqJw+JXZY=; b=eevmpjiNRNMD+slICsaHSnlygYZ5/wgFK5C3xoF/a2350gga/Dcjo57SPiNcKOCOfH SywkNwQVN7pMCOiIoxKQy36wwp9QrQYf7Fb2pJEL2PTh2HHGLzG8203JjtdPSL29B+GE 8I0jMGm8mBe2ZVHVSeWtC3LDzknb3B94BPce7d4ssOoYxLC5U7y/j7HB3hXWql3EO9qF dhqej4FLb+3oZvKb6QU/mtPCMaya7IoPZ7qTDjqCsnWSz5t9Eraef2JJIo6NjeEt/GMR lr0qR5zTiuolQndbp8IhiLD9b2HBjIQcveIeADS9v5KB8cEC+QGwSJbAMVSb9Cwqw+Ky vcNQ== X-Gm-Message-State: AJcUukczfMRtu6FXo5MxoqWedVoGX7pxCmSlDwaLbAlrWSKaHZcnL9gc eZJ1xczhjqUhzF8m1OQQNK/eVA== X-Google-Smtp-Source: ALg8bN7P8O4pf4wJhjWuLR+fAu7or2RWr04LTtNdrTf7NQWlYSq0ihcPZ5wG2ndGc4pt9QRvsraNVw== X-Received: by 2002:a65:6684:: with SMTP id b4mr15283201pgw.55.1547253139727; Fri, 11 Jan 2019 16:32:19 -0800 (PST) Received: from gwendal.mtv.corp.google.com ([2620:15c:202:1:3c8f:512b:3522:dfaf]) by smtp.gmail.com with ESMTPSA id m67sm110906659pfm.73.2019.01.11.16.32.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 16:32:18 -0800 (PST) From: Gwendal Grignou To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, groeck@chromium.org, keescook@chromium.org Subject: [PATCH] FIXUP: proc: Provide details on speculation flaw mitigations Date: Fri, 11 Jan 2019 16:32:12 -0800 Message-Id: <20190112003212.103301-1-gwendal@chromium.org> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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] Signed-off-by: Gwendal Grignou --- 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