From patchwork Thu Apr 13 21:11:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 1768662 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=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=i7d+nzvB; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (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 4PyC565h1Hz1yZr for ; Fri, 14 Apr 2023 07:14:34 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pn4Gt-00006t-5M; Thu, 13 Apr 2023 21:14:23 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pn4Gn-0008Mt-Kp for kernel-team@lists.ubuntu.com; Thu, 13 Apr 2023 21:14:17 +0000 Received: from quatroqueijos.. (unknown [179.93.161.98]) (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-canonical-1.canonical.com (Postfix) with ESMTPSA id 74A273FFEA for ; Thu, 13 Apr 2023 21:14:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1681420456; bh=1pybTL/kEuCXW2wq/c25PP+MTqGlbFCMDReRKtt4jz8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i7d+nzvBFbm4HrG1miOQjbNJcqPPlvCiBM+q0/B4AL+GyYbhnnFw2bxYuy0m0SR90 pE1KEDZIIUtePDAtIRfG8VHTRBvOxfZJciOA7njB3gJyaItgsvk/rSwvWrLXOZEQdX Uf82HBED+jeOqOVSysO6wnoIMOuOsGGAEyaPhvPmGByoSiLfCWYENHzzJSGYXWP7eX rpqqrdGoQdfoFeL4oKeduV7P7lYF3gAk9y0I/Ixr7/UmlqMJtjfv8W9ywRF68QwWrW 9wJp2lpI0LTYRzfeCCCeau57YIEeiuUIlPrgxy3iAkW6FxM8eYHVj1t/9BN1AMxHoZ fq7As8s2fT0yg== From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [SRU Jammy 2/2] UBUNTU: [Config]: Make sure CONFIG_NET_CLS_TCINDEX is not available Date: Thu, 13 Apr 2023 18:11:06 -0300 Message-Id: <20230413211114.3130540-7-cascardo@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230413211114.3130540-1-cascardo@canonical.com> References: <20230413211114.3130540-1-cascardo@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" CVE-2023-1829 Signed-off-by: Thadeu Lima de Souza Cascardo --- debian.master/abi/amd64/generic.modules | 1 - debian.master/abi/arm64/generic-64k.modules | 1 - debian.master/abi/arm64/generic.modules | 1 - debian.master/abi/armhf/generic-lpae.modules | 1 - debian.master/abi/armhf/generic.modules | 1 - debian.master/abi/ppc64el/generic.modules | 1 - debian.master/abi/s390x/generic.modules | 1 - debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 1 - 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules index 360d03ef923a..04df13fe178b 100644 --- a/debian.master/abi/amd64/generic.modules +++ b/debian.master/abi/amd64/generic.modules @@ -804,7 +804,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules index 0842aabad957..120afafa766d 100644 --- a/debian.master/abi/arm64/generic-64k.modules +++ b/debian.master/abi/arm64/generic-64k.modules @@ -880,7 +880,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules index 5368ebe75cff..7bf849ce08e0 100644 --- a/debian.master/abi/arm64/generic.modules +++ b/debian.master/abi/arm64/generic.modules @@ -880,7 +880,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules index 54d59ec07733..acb00b75ac99 100644 --- a/debian.master/abi/armhf/generic-lpae.modules +++ b/debian.master/abi/armhf/generic-lpae.modules @@ -830,7 +830,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules index 9f95f1900de6..6e732b60f5fb 100644 --- a/debian.master/abi/armhf/generic.modules +++ b/debian.master/abi/armhf/generic.modules @@ -839,7 +839,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules index ae2c32244800..196a8663cd72 100644 --- a/debian.master/abi/ppc64el/generic.modules +++ b/debian.master/abi/ppc64el/generic.modules @@ -761,7 +761,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cm109 cm32181 diff --git a/debian.master/abi/s390x/generic.modules b/debian.master/abi/s390x/generic.modules index 90de6937ccc7..dccd1954e7e3 100644 --- a/debian.master/abi/s390x/generic.modules +++ b/debian.master/abi/s390x/generic.modules @@ -112,7 +112,6 @@ cls_matchall cls_route cls_rsvp cls_rsvp6 -cls_tcindex cls_u32 cmac coda diff --git a/debian.master/config/annotations b/debian.master/config/annotations index e24b4d05ff1f..d8400600cd2b 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12937,7 +12937,7 @@ CONFIG_NET_SCH_INGRESS policy<{'amd64': 'm', 'arm64': ' CONFIG_NET_SCH_PLUG policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_NET_SCH_ETS policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_NET_CLS_BASIC policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_NET_CLS_TCINDEX policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_NET_CLS_TCINDEX policy<{'amd64': '-', 'arm64': '-', 'armhf': '-', 'ppc64el': '-', 's390x': '-'}> CONFIG_NET_CLS_ROUTE4 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_NET_CLS_FW policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_NET_CLS_U32 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 39840e1aa2af..c5c5deae73ca 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6880,7 +6880,6 @@ CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_U32=m CONFIG_NET_CORE=y CONFIG_NET_DEVLINK=y