From patchwork Fri Apr 12 19:23:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuxuan Luo X-Patchwork-Id: 1923227 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 4VGRLp3HQ4z1yYP for ; Sat, 13 Apr 2024 05:23:45 +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 1rvMUr-000410-E2; Fri, 12 Apr 2024 19:23:37 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rvMUp-00040W-Gs for kernel-team@lists.ubuntu.com; Fri, 12 Apr 2024 19:23:35 +0000 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (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-0.canonical.com (Postfix) with ESMTPS id BBA5F3F188 for ; Fri, 12 Apr 2024 19:23:34 +0000 (UTC) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-78d5fed0e1aso119152085a.2 for ; Fri, 12 Apr 2024 12:23:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712949812; x=1713554612; 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=nICUU6MwYDyuetJNgvhr5XTqMH8ue+5cKbQlYTk0HoY=; b=BTUUH7Mz5E3lY/YVfMvIxuA9N4Rx5P7tQ2Adma45P1+OPb5Y6MpJ5ecplH2do8aP5a DSTt7VfoS08+HlmbKq9iLHQmaWYTjzkn6hHlZ2AmYV8u32wCBYE7JPtDg1gwkvHH2dch 9TofVk2RRqZVJK3bvM863X25rhwqg5gkwuzEe2JTe1BM6AI/JU6NTou7eImGuWS8Qxrp uy3Ur8eNBrjxqvi+8rp68zqtvuLtty1855kYuS651t/mUp1AHn8baloGkh86E9r33r5r 2JPO9JeErtvfxhJKQLTmWXliNDfwHazzDZOTsOJgQcAdPnkivOpprshSIq4QD5VegYwO 9Aiw== X-Gm-Message-State: AOJu0Yy+vtCD0n7y3VtC07tCoCqs/uQxXmgGVaNfGp+qtUXHl0av9H66 D9DcYc/ikl/+b3dIouau+w7fKqCxCvgkJ2AGK4Bm26AKFMXgyKeBhNBFqEAm0UuaxVaOplN3QFF 8PszHLYIMRX+9X6yl4sOpxjnaZMbXSHwVHHp3Ugv33VtW/ZQLs3ejOvOxInC3OZBtk9cEb3rCR7 WcfkTHbFUcYUwO X-Received: by 2002:a05:620a:1710:b0:78e:ba60:89f4 with SMTP id az16-20020a05620a171000b0078eba6089f4mr4504075qkb.16.1712949812687; Fri, 12 Apr 2024 12:23:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGi3BjDtvXb7pi9joQEajgYOJaRnwEasTxah52xTec/C4t/FnGvC4HDQJB2QIG9IU+HOKLPLQ== X-Received: by 2002:a05:620a:1710:b0:78e:ba60:89f4 with SMTP id az16-20020a05620a171000b0078eba6089f4mr4504059qkb.16.1712949812408; Fri, 12 Apr 2024 12:23:32 -0700 (PDT) Received: from cache-ubuntu.hsd1.nj.comcast.net ([2001:67c:1562:8007::aac:4795]) by smtp.gmail.com with ESMTPSA id b20-20020a05620a0cd400b0078d6a0d5728sm2789272qkj.29.2024.04.12.12.23.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 12:23:31 -0700 (PDT) From: Yuxuan Luo To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] updateconfigs for CONFIG_BHI_{AUTO|OFF|ON} Date: Fri, 12 Apr 2024 15:23:27 -0400 Message-Id: <20240412192327.89307-3-yuxuan.luo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412192327.89307-1-yuxuan.luo@canonical.com> References: <20240412192327.89307-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" Adds annotation configs to comply new kernel configs. CVE-2024-2201 Signed-off-by: Yuxuan Luo --- debian.master/config/annotations | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 0c6260bf190ce..cb15ddac15579 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7836,6 +7836,8 @@ CONFIG_MISDN_NETJET policy<{'amd64': 'm', 'arm64': ' CONFIG_MISDN_SPEEDFAX policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MISDN_W6692 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY policy<{'arm64': 'y'}> +CONFIG_SPECTRE_BHI_OFF policy<{'amd64': 'n'}> +CONFIG_SPECTRE_BHI_ON policy<{'amd64': 'y'}> CONFIG_MK8 policy<{'amd64': 'n'}> CONFIG_MKISS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}> CONFIG_MLX4_CORE policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>