From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B60FA14273 for ; Wed, 4 Oct 2023 18:34:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DSVV5ZWQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36CB0C433C7; Wed, 4 Oct 2023 18:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696444464; bh=gmC+51h1LiHx2LCiEzN+N4KYO5g+QfkfnvBiW8PFSZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DSVV5ZWQsKRB1TzIqSkeYK2UEtLnK9Hk6aI/Xs1o++8CZJAgv1kc4dti2y50qqjlt wlxCB0l4L6DETAqKC0kCuJARY+MEoRS+kV2nVDtPqEqLi2kqW2MCoDgUX/44NwhvPx muQPrpFBwkoQwDOoVvMOgC7+WHK0KVwa8Zbdkpbo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pu Wen , Ingo Molnar , "Borislav Petkov (AMD)" Subject: [PATCH 6.5 242/321] x86/srso: Add SRSO mitigation for Hygon processors Date: Wed, 4 Oct 2023 19:56:27 +0200 Message-ID: <20231004175240.458590827@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004175229.211487444@linuxfoundation.org> References: <20231004175229.211487444@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.5-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pu Wen commit a5ef7d68cea1344cf524f04981c2b3f80bedbb0d upstream. Add mitigation for the speculative return stack overflow vulnerability which exists on Hygon processors too. Signed-off-by: Pu Wen Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Cc: Link: https://lore.kernel.org/r/tencent_4A14812842F104E93AA722EC939483CEFF05@qq.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1288,7 +1288,7 @@ static const struct x86_cpu_id cpu_vuln_ 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), {} };