From patchwork Wed Apr 17 23:54:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuxuan Luo X-Patchwork-Id: 1924777 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 4VKd6y2m7zz1yZx for ; Thu, 18 Apr 2024 09:54:34 +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 1rxF6h-0006Ch-VF; Wed, 17 Apr 2024 23:54:27 +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 1rxF6a-0005tc-3A for kernel-team@lists.ubuntu.com; Wed, 17 Apr 2024 23:54:20 +0000 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (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 D64D43F8D9 for ; Wed, 17 Apr 2024 23:54:19 +0000 (UTC) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-78f04065740so35051685a.2 for ; Wed, 17 Apr 2024 16:54:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713398058; x=1714002858; 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=0sUUzdkR0h05Z08GUpnYBc6VfcQ2obVHaLwoxBk0dNQ=; b=mbF6V1k90WRpDn5VD0SKRicXd4KLK5TSIhohKgLo/iaOUPbt5r4C0OeKUt/oOJuK30 MYyqaEyLCR1fhxnqx1AKNH5CG/XZt2i8s0M2YS50H2YhQ5l6Mbkk5JzrvQYLh1SeNNhN Uivgv2QXR11xcrSfZVZW3EZXRF1Vr9rPeSkVtED3fs1L0mBNBHJ8TIPFn/K+nCfcMDxX 88zw6RELw40GC4ftJOxx2t9yY3IT3A5vWaPj/sWsKx3+U2zdNLTjP8XrpLMylaBrmswd M5p1H7BiqA3OTWCoyAO8ve4znqQ/6wtfSjepbjgJeiINWrLVHJx5qc2CJ0cK63Joz9kG svOQ== X-Gm-Message-State: AOJu0YwnOuK5+N7p7EG8ITENARWRsz3QLeYeA0abhlOr3J7tNm3NFlZd OsaJRU+gsQNQYFp7OGNtMtVGUvhZeUccE0oxSQZH7iC1+UegDZOq4V3c8ArnPe74l9NJ0pZjHti PAZhMfr1vWjIoIFVh9PicXsFczmGsHl6nBHcE2j7LrnGeoiMdppn8LoGn2t+wxRQwzYOUDWFnwq eMnLOYhLUXgXb7 X-Received: by 2002:a05:620a:4ad3:b0:78d:6398:d684 with SMTP id sq19-20020a05620a4ad300b0078d6398d684mr1197544qkn.64.1713398057971; Wed, 17 Apr 2024 16:54:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfMRzXzHe9ZBpXB1NbichLFqNKUI37JgxM/kDp+dMF/TquGQasL0E0gDqaEkfwaSpt3/ey0A== X-Received: by 2002:a05:620a:4ad3:b0:78d:6398:d684 with SMTP id sq19-20020a05620a4ad300b0078d6398d684mr1197530qkn.64.1713398057677; Wed, 17 Apr 2024 16:54:17 -0700 (PDT) Received: from cache-ubuntu.hsd1.nj.comcast.net ([2001:67c:1562:8007::aac:4795]) by smtp.gmail.com with ESMTPSA id x27-20020a05620a099b00b0078d6a0d5728sm129208qkx.29.2024.04.17.16.54.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 16:54:16 -0700 (PDT) From: Yuxuan Luo To: kernel-team@lists.ubuntu.com Subject: [PATCH 11/11] UBUNTU: [Config] updateconfigs for CONFIG_BHI_{AUTO|OFF|ON} Date: Wed, 17 Apr 2024 19:54:01 -0400 Message-Id: <20240417235401.243631-12-yuxuan.luo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240417235401.243631-1-yuxuan.luo@canonical.com> References: <20240417235401.243631-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. Set AUTO as default to be less intrusive. CVE-2024-2201 Signed-off-by: Yuxuan Luo --- debian.master/config/annotations | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 06cf3f9744fa9..2b4ec46c8bd99 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -6713,6 +6713,9 @@ CONFIG_MISDN_NETJET policy<{'amd64': 'm', 'arm64': ' CONFIG_MISDN_SPEEDFAX policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_MISDN_W6692 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY policy<{'arm64': 'y'}> +CONFIG_SPECTRE_BHI_AUTO policy<{'amd64': 'y'}> +CONFIG_SPECTRE_BHI_OFF policy<{'amd64': 'n'}> +CONFIG_SPECTRE_BHI_ON policy<{'amd64': 'n'}> CONFIG_MIXCOMWD policy<{'i386': 'm'}> CONFIG_MK6 policy<{'i386': 'n'}> CONFIG_MK7 policy<{'i386': 'n'}>