linux-kernel - [PATCH 4.4 170/193] x86/bugs: Drop one "mitigation" from dmesg

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20180223170352.649818604@linuxfoundation.org>
Date:   Fri, 23 Feb 2018 19:26:43 +0100
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org, Borislav Petkov <bp@...e.de>,
        Thomas Gleixner <tglx@...utronix.de>, riel@...hat.com,
        ak@...ux.intel.com, peterz@...radead.org,
        David Woodhouse <dwmw2@...radead.org>, jikos@...nel.org,
        luto@...capital.net, dave.hansen@...el.com,
        torvalds@...ux-foundation.org, keescook@...gle.com,
        Josh Poimboeuf <jpoimboe@...hat.com>,
        tim.c.chen@...ux.intel.com, pjt@...gle.com,
        David Woodhouse <dwmw@...zon.co.uk>,
        Jack Wang <jinpu.wang@...fitbricks.com>
Subject: [PATCH 4.4 170/193] x86/bugs: Drop one "mitigation" from dmesg

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Borislav Petkov <bp@...e.de>

(cherry picked from commit 55fa19d3e51f33d9cd4056d25836d93abf9438db)

Make

[    0.031118] Spectre V2 mitigation: Mitigation: Full generic retpoline

into

[    0.031118] Spectre V2: Mitigation: Full generic retpoline

to reduce the mitigation mitigations strings.

Signed-off-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: riel@...hat.com
Cc: ak@...ux.intel.com
Cc: peterz@...radead.org
Cc: David Woodhouse <dwmw2@...radead.org>
Cc: jikos@...nel.org
Cc: luto@...capital.net
Cc: dave.hansen@...el.com
Cc: torvalds@...ux-foundation.org
Cc: keescook@...gle.com
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: tim.c.chen@...ux.intel.com
Cc: pjt@...gle.com
Link: https://lkml.kernel.org/r/20180126121139.31959-5-bp@alien8.de
Signed-off-by: David Woodhouse <dwmw@...zon.co.uk>
[jwang: port to 4.4]
Signed-off-by: Jack Wang <jinpu.wang@...fitbricks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
 arch/x86/kernel/cpu/bugs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -90,7 +90,7 @@ static const char *spectre_v2_strings[]
 };
 
 #undef pr_fmt
-#define pr_fmt(fmt)     "Spectre V2 mitigation: " fmt
+#define pr_fmt(fmt)     "Spectre V2 : " fmt
 
 static enum spectre_v2_mitigation spectre_v2_enabled = SPECTRE_V2_NONE;