From patchwork Fri Apr 12 19:23:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuxuan Luo X-Patchwork-Id: 1923242 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VGRMX6gf5z1yYP for ; Sat, 13 Apr 2024 05:24:24 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rvMVW-0004v6-2c; Fri, 12 Apr 2024 19:24:18 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rvMVQ-0004cG-8O for kernel-team@lists.ubuntu.com; Fri, 12 Apr 2024 19:24:12 +0000 Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id C84F93F17B for ; Fri, 12 Apr 2024 19:24:11 +0000 (UTC) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-69942c6d975so15009756d6.1 for ; Fri, 12 Apr 2024 12:24:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712949850; x=1713554650; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7ZkgMfAkzR6Y3FCc6ZFUgqeWyxLcNR4EC7/yOk3zcRM=; b=I2lOlMky+/S63Lmrn2/roRjuh9I7v9s+Cr6RPAzNCzYifEMYWPrMEhbpkcnArfEtaK D0KPgfWikxHxfG/tEr68pf9X0la7SjWUyT7zPXKqBCLv7SRWv2FATQx2aAxAXhZW48aj 74u8VuoKY5GUeUt9Yi6H+0hyj2IYfdTnmMfWVs0LMKjLUW753mGK2kkkRahMSxIwkucu +KXlOwcUMtCsYn7qBfr+cI0CGfccmMv20zg6Ooob6xNvJ2XY5XN+aasePJvdr6w8DL4K s2rF9PmfGVxQzC3rBjtU39GjnIkQeOR9+kUarVYz/c4JLMv8uGb9dFHMWXcL9FRX7/I/ NsZQ== X-Gm-Message-State: AOJu0Yx9EZoqienUtCLrb3LYNjrYMg0aKBXeL9pZec7UYvVOpFF18bc9 CJHwECT9rmC4onJaduU5Z+5s/JEMkr7CdbdtplFpAzBtWeQbYjm+AO4HUCWZz9TKICBROYBLWRf umlrDO/Xyc/QWDvLIvXPn37qTS1dItlrO2YFAmU/aOvGeUn2ZlusK0VLC6D4PSnv5g73RjVy5RD arO13uZDuYxO4O X-Received: by 2002:a05:6214:5983:b0:69b:5475:8a67 with SMTP id qp3-20020a056214598300b0069b54758a67mr5278352qvb.10.1712949850328; Fri, 12 Apr 2024 12:24:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGVuF01WEzhY3Q1j6/CAvRju55PtfXa4yRZxIZgjxLGBfwEGjUN2U8lkyImhlbXQk84ZyzzA== X-Received: by 2002:a05:6214:5983:b0:69b:5475:8a67 with SMTP id qp3-20020a056214598300b0069b54758a67mr5278334qvb.10.1712949850066; Fri, 12 Apr 2024 12:24:10 -0700 (PDT) Received: from cache-ubuntu.hsd1.nj.comcast.net ([2001:67c:1562:8007::aac:4795]) by smtp.gmail.com with ESMTPSA id z6-20020a0ce986000000b0069b47a53012sm2654071qvn.140.2024.04.12.12.24.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 12:24:09 -0700 (PDT) From: Yuxuan Luo To: kernel-team@lists.ubuntu.com Subject: [PATCH 12/13] x86: set SPECTRE_BHI_ON as default Date: Fri, 12 Apr 2024 15:23:50 -0400 Message-Id: <20240412192351.89501-14-yuxuan.luo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412192351.89501-1-yuxuan.luo@canonical.com> References: <20240412192351.89501-1-yuxuan.luo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Greg Kroah-Hartman commit 2bb69f5fc72183e1c62547d900f560d0e9334925 upstream. Part of a merge commit from Linus that adjusted the default setting of SPECTRE_BHI_ON. Cc: Linus Torvalds Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 8d8dc7ee5b98fca7a65c800df93ded071a96fd49) CVE-2024-2201 Signed-off-by: Yuxuan Luo --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b0e7b3c5a351a..c5cc7baf48c66 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2512,7 +2512,7 @@ config GDS_FORCE_MITIGATION choice prompt "Clear branch history" depends on CPU_SUP_INTEL - default SPECTRE_BHI_AUTO + default SPECTRE_BHI_ON help Enable BHI mitigations. BHI attacks are a form of Spectre V2 attacks where the branch history buffer is poisoned to speculatively steer