Commit f04e7dc5 authored Sep 20, 2022 by Kim Phillips Committed by Zheng Zengkai Sep 20, 2022

x86/bugs: Remove apostrophe typo

stable inclusion
from stable-v5.10.133
commit 725da3e67cec529788e284dac2c1249b2a531839
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5PTAS
CVE: CVE-2022-29900,CVE-2022-23816,CVE-2022-29901

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=725da3e67cec529788e284dac2c1249b2a531839



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

commit bcf16315 upstream.

Remove a superfluous ' in the mitigation string.

Fixes: e8ec1b6e ("x86/bugs: Enable STIBP for JMP2RET")
Signed-off-by: Kim Phillips <kim.phillips@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Lin Yujun <linyujun809@huawei.com>
Reviewed-by: Zhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 894b8992

arch/x86/kernel/cpu/bugs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1137,7 +1137,7 @@ spectre_v2_user_select_mitigation(void)
		if (retbleed_mitigation == RETBLEED_MITIGATION_UNRET) {
		if (mode != SPECTRE_V2_USER_STRICT &&
		mode != SPECTRE_V2_USER_STRICT_PREFERRED)
		pr_info("Selecting STIBP always-on mode to complement retbleed mitigation'\n");
		pr_info("Selecting STIBP always-on mode to complement retbleed mitigation\n");
		mode = SPECTRE_V2_USER_STRICT_PREFERRED;
		}