From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF140E7C4E9 for ; Wed, 4 Oct 2023 18:34:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244405AbjJDSe2 (ORCPT ); Wed, 4 Oct 2023 14:34:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244391AbjJDSe1 (ORCPT ); Wed, 4 Oct 2023 14:34:27 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2B6098 for ; Wed, 4 Oct 2023 11:34:24 -0700 (PDT) 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 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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), {} };