From: Pu Wen puwen@hygon.cn

mainline inclusion from mainline-v6.6-rc4 commit a5ef7d68cea1344cf524f04981c2b3f80bedbb0d 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...

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

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

Signed-off-by: Pu Wen puwen@hygon.cn Signed-off-by: Ingo Molnar mingo@kernel.org Acked-by: Borislav Petkov (AMD) bp@alien8.de Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/tencent_4A14812842F104E93AA722EC939483CEFF05@qq.co... Signed-off-by: Wei Li liwei391@huawei.com --- arch/x86/kernel/cpu/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 48bd58e3f5183..c69bc3917e307 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -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), {} };