| Message ID | 169588805808.27769.603081620807141672.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp3209308vqu;
Thu, 28 Sep 2023 03:31:52 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IEAl/rKVdQbtfe+YU9qv13x2leX4RuPwaGxfGV8omyNWjC352sWGPQ0kG7Y8JY2fST2K4bv
X-Received: by 2002:a05:6a00:22c3:b0:68e:2822:fb36 with SMTP id
f3-20020a056a0022c300b0068e2822fb36mr755897pfj.8.1695897111760;
Thu, 28 Sep 2023 03:31:51 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1695897111; cv=none;
d=google.com; s=arc-20160816;
b=rlX8DYFdM5Z10cmfi8YXsTJqvCifU1hGIy9ybAwcldXqTzg/GE1c2crVOJB+vFzaC4
90tqbtnHSHLhoF+aKcYymanMpd8QWtdJGRwky+JECBxOq5mHvBs0YhrPy5oAsJ1sJhqb
rSpD2M1PYXvZct4USPmfhEKw0bcFYR00/NwplhVMk2QG7AROZM587Tec7PoUxPvOyqUb
ViFVDXrldofeRLiqCGK1mjjPt3xV0YHisJiIHztOKX8HY4wQ/gBex5U21hjywHz7PGzL
AJ2P/z7FPMNwzprI5ggYgjZM8T9lTT5yDzA/8UvMDg0cpPQucxfBZn29T/N1s3YLDl02
WUIQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:robot-unsubscribe
:robot-id:message-id:mime-version:references:in-reply-to:cc:subject
:to:reply-to:sender:from:dkim-signature:dkim-signature:date;
bh=y8b9q38myYZXgEZ8xuimBDP6RUNofjH0Ic81MrIcnGE=;
fh=fRpDT/8m1E571nhg92GfAtu8ZTSn1d3hyiHJ+15RPG8=;
b=qUmFg8vbjPOEgR2SSvq4oQjOKFqVyD93laDEu/Ij/euKKle5DwbkP5ygZZNISX6r9Q
Xw06CgsTxDy+K0yNTMU19ivQ0L6AmipjBy33R77qXnv7hTB6VrKJrNPxYimLlgra0BdJ
ppvfjNT93rfmc2msSosaojYsxggQXO4QRS6IHSsvr/7foDnzMz4WhMdpALlbwPHGvQBP
NcUiQk7mrvwwee/4V+j6o2zs3uf2G6Jyh9oPrmJisbteg2HWcUnsWBy7N/H5tu6wJjjK
Fti+Mb1hRV4tFMdc1HzGkoOCg53OMaT2LT5LZkCvARLpj3tWPT/L5c3VapxfyUr/8Epz
tGTQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=JtEx1Twm;
dkim=neutral (no key) header.i=@linutronix.de header.b=bsIj1MwN;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4])
by mx.google.com with ESMTPS id
t23-20020a656097000000b0058555ea0a23si3831950pgu.512.2023.09.28.03.31.51
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 28 Sep 2023 03:31:51 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
client-ip=2620:137:e000::3:4;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=JtEx1Twm;
dkim=neutral (no key) header.i=@linutronix.de header.b=bsIj1MwN;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::3:4 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by howler.vger.email (Postfix) with ESMTP id E04C4806E542;
Thu, 28 Sep 2023 01:01:12 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230314AbjI1IBD (ORCPT <rfc822;ruipengqi7@gmail.com> + 20 others);
Thu, 28 Sep 2023 04:01:03 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57262 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229639AbjI1IBC (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 28 Sep 2023 04:01:02 -0400
Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 560D492;
Thu, 28 Sep 2023 01:01:01 -0700 (PDT)
Date: Thu, 28 Sep 2023 08:00:58 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1695888059;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=y8b9q38myYZXgEZ8xuimBDP6RUNofjH0Ic81MrIcnGE=;
b=JtEx1TwmMZq11ZYN8Lhi08+7TqyGq/JC92AyNl1TJZF5cDd0Trly4sBV9O3qlg4EdzDe0h
BE+z8TxbaFpFz0ADQV2SlXmVjudJvblbhla6kKRGMepPEd2U/FrdqKc1sulXI2VFjjzG4d
Euw+tQLDtmTGdsSXQhTEKseBExvYTXJoyW0ZVqE8ClO0YemjpNKRPE0+fuoXW3erY/J50e
v6lGF9BcLl5JXvT9f02WAId0UqIpYiNaWEcSETFYfX++48zPmtlWgaE9sPjydiLg7CQa4S
WO72lYtE6y9NbTXINZV4goBCwxiRaVzUXtKKK3KJ4Y5WxDfDp9Ua5oEvzbtuIw==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1695888059;
h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date:
message-id:message-id:to:to:cc:cc:mime-version:mime-version:
content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=y8b9q38myYZXgEZ8xuimBDP6RUNofjH0Ic81MrIcnGE=;
b=bsIj1MwN1I9uphbtoUNGV/CTJTryqfFfS7mnk99gQsJV6VBRhSYWM25FBMf7hU/0xLnwKR
vohvaSsIrUdaTpDg==
From: "tip-bot2 for Pu Wen" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: x86/urgent] x86/srso: Add SRSO mitigation for Hygon processors
Cc: Pu Wen <puwen@hygon.cn>, Ingo Molnar <mingo@kernel.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>, <stable@vger.kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <tencent_4A14812842F104E93AA722EC939483CEFF05@qq.com>
References: <tencent_4A14812842F104E93AA722EC939483CEFF05@qq.com>
MIME-Version: 1.0
Message-ID: <169588805808.27769.603081620807141672.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from
these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,
SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]);
Thu, 28 Sep 2023 01:01:12 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1778264682921986069
X-GMAIL-MSGID: 1778277010017979669
|
| Series |
[tip:,x86/urgent] x86/srso: Add SRSO mitigation for Hygon processors
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Sept. 28, 2023, 8 a.m. UTC
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), {} };