From: Pu Wen <puwen@hygon.cn>

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

Signed-off-by: Pu Wen <puwen@hygon.cn>
Cc: <stable@vger.kernel.org>
---
 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 382d4e6b848d..4e5ffc8b0e46 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1303,7 +1303,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),
 	{}
 };
-- 
2.23.0

On Thu, Sep 28, 2023 at 02:59:16PM +0800, Pu Wen wrote:
> From: Pu Wen <puwen@hygon.cn>
> 
> Add mitigation for the speculative return stack overflow vulnerability
> which exists on Hygon processors.
> 
> Signed-off-by: Pu Wen <puwen@hygon.cn>
> Cc: <stable@vger.kernel.org>
> ---
>  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 382d4e6b848d..4e5ffc8b0e46 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -1303,7 +1303,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),
>  	{}
>  };
> -- 

Acked-by: Borislav Petkov (AMD) <bp@alien8.de>

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     a5ef7d68cea1344cf524f04981c2b3f80bedbb0d
Gitweb:        https://git.kernel.org/tip/a5ef7d68cea1344cf524f04981c2b3f80bedbb0d
Author:        Pu Wen <puwen@hygon.cn>
AuthorDate:    Thu, 28 Sep 2023 14:59:16 +08:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Thu, 28 Sep 2023 09:57:07 +02:00

x86/srso: Add SRSO mitigation for Hygon processors

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.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 382d4e6..4e5ffc8 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1303,7 +1303,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),
 	{}
 };