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,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 8B6EAC43387 for ; Mon, 14 Jan 2019 18:13:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57F5620659 for ; Mon, 14 Jan 2019 18:13:43 +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="lolM0dMJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726751AbfANSNm (ORCPT ); Mon, 14 Jan 2019 13:13:42 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:41574 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726729AbfANSNm (ORCPT ); Mon, 14 Jan 2019 13:13:42 -0500 Received: by mail-pf1-f196.google.com with SMTP id b7so10708246pfi.8 for ; Mon, 14 Jan 2019 10:13:42 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=1exWsEXK8YLyBT1pEHhCNqLXne6vXtZoIZTZWkvbMUI=; b=lolM0dMJopthw30Eh6d0B7Z0ydetDbkoXDdPI0x9ccGiwUY023Z3XAJ2FSthlww2Mp CdNkC2aaQf/Fbkxm/6ld8dj01t3KNpO1CDmAGy9uLa20SkkDBZmr36l33Ut+gUKU6TIx FINlDyxrORJwy4pzxzRon45dbQaulFXb0GUsW05SBjZmnvqqEeIMlwiFAMieIF0NgiFq hLA6bv634kx0HeHibhajXnu31k8rFd+bxHx0FcktHhwgEpJ8Vx4BLUtnzKk/zQftsORq XJNa0bDW/UNPZjnkX9v5yrZBQ5MvjYlnQlnIrA0W/kIIBs1wtU+voQeFh9upQo57hvFn eyRw== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=1exWsEXK8YLyBT1pEHhCNqLXne6vXtZoIZTZWkvbMUI=; b=i6Sxf+Mo9BM+KqcoGTsi+48ZjJF/mBEcJ1Dz9DEKvKZtAWuGefpirJWaudunImgekS 9lOill5mOdi2z2k5cJRHWIwc18uBH/UAkEX12U1S9hShwvC/cCjOwpXHSyLK6bS6lC2B p36hgNlAxxJW/qDH2+3QWRQIZ6r11EfpMOQGO6JlpS7tmrUF5iD1+nVKUKHIgbunm++F XmpriPWlPjLvSQDEF8ZWLu/y4WIrBJXF7MdeURP3UgRWxC65/G2C38r46c/spzEeJcZ4 L4XcWP0DjtzWOEa0mvhC2taXqn2E4ZP/1m5eaQge7Tp/FWDCWt+S25tbynrXhs7plNDf YhkA== X-Gm-Message-State: AJcUukdTAOQ01/SwfJOklXz4KBr3dyoAJcH6F8P7+XruKoXVE8GpF2vW TDjSXRtrBZbPs3x19baBFmKSX84bbtEr1w== X-Google-Smtp-Source: ALg8bN5tvAG62jwQtafbOmXB7s+9vliK7tF86u6B6RnnUzJAX0aVGGD28UAzSb5hCpaiTIm2MX0tHg== X-Received: by 2002:a62:b2c3:: with SMTP id z64mr26324184pfl.120.1547489621624; Mon, 14 Jan 2019 10:13:41 -0800 (PST) Received: from gwendal.mtv.corp.google.com ([2620:15c:202:1:3c8f:512b:3522:dfaf]) by smtp.gmail.com with ESMTPSA id i4sm1980609pfj.82.2019.01.14.10.13.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 10:13:40 -0800 (PST) From: Gwendal Grignou To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, groeck@chromium.org, keescook@chromium.org Subject: [PATCH v2] proc: Remove empty line in /proc/self/status Date: Mon, 14 Jan 2019 10:13:36 -0800 Message-Id: <20190114181336.74501-1-gwendal@chromium.org> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog In-Reply-To: References: 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] Fixes: 84964fa3e5a0 ("proc: Provide details on speculation flaw mitigations") Signed-off-by: Gwendal Grignou --- v2: Format commit message properly with proper subject and fixes keyword. 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