Commit fbf02154 authored by Pu Wen's avatar Pu Wen Committed by Wei Li
Browse files

x86/srso: Add SRSO mitigation for Hygon processors 

mainline inclusion
from mainline-v6.6-rc4
commit a5ef7d68
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I94P0E
CVE: CVE-2023-52482

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=a5ef7d68cea1344cf524f04981c2b3f80bedbb0d



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

Add mitigation for the speculative return stack overflow vulnerability
which exists on Hygon processors too.

Signed-off-by: default avatarPu Wen <puwen@hygon.cn>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/tencent_4A14812842F104E93AA722EC939483CEFF05@qq.com


Signed-off-by: default avatarWei Li <liwei391@huawei.com>
parent 7d417511

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = { 
	VULNBL_AMD(0x15, RETBLEED),

	VULNBL_AMD(0x16, RETBLEED),

	VULNBL_AMD(0x17, RETBLEED | SMT_RSB | SRSO),

	VULNBL_HYGON(0x18, RETBLEED | SMT_RSB),

	VULNBL_HYGON(0x18, RETBLEED | SMT_RSB | SRSO),

	VULNBL_AMD(0x19, SRSO),

	{}

};