From patchwork Wed Sep 27 18:54:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magali Lemes X-Patchwork-Id: 1840392 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 4Rwm670rkfz1yp0 for ; Thu, 28 Sep 2023 04:55:59 +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 1qlZhM-0004Rm-HT; Wed, 27 Sep 2023 18:55:48 +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 1qlZge-0003yp-Mb for kernel-team@lists.ubuntu.com; Wed, 27 Sep 2023 18:55:04 +0000 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.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-1.canonical.com (Postfix) with ESMTPS id CD36F3F626 for ; Wed, 27 Sep 2023 18:55:03 +0000 (UTC) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-1c4103c26ccso162375085ad.3 for ; Wed, 27 Sep 2023 11:55:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695840902; x=1696445702; 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=9uo3B9d6cNIFY/F5ALzGcLT+0DKIwcV8jU5Gw31a1gM=; b=k43BeYE/t9EMTYi41Q/iymLeoaq0p2UrY2W7ku01hoOgIpCGGJ37cuBWnxcG4hnBiw 7GchDRfyG5vP4NPVabcTorefT+H2DjNaOfTXZFib5l8Bp3T8y+9kJXa4V9g9QxMwUSkn G5jAB6DxMC5XU2tRHncqRExfJMgz0oOMX4JhzZqtIryK0yG1EOVkwC2eIDCjvhNCsg35 Cp7uPcwgPCgHocQI234rb0dYdGe6Mq9HLZvFTLNxs/qP0GOpJLyKMKsXr0kSKf8FIdFE EkFcc7NUO7f8LdFVNSTdfzJES1g+6cvfVQ0c+INmQg5evldFPOjZPU54XmrYPrxVpY3U OZiQ== X-Gm-Message-State: AOJu0YwkJICxuys+qXRmXoaDadaN4yONdTcWUr/zRWwOVjMWvIxO7Zmq tN7euAQkOqv+W7MOZEjMcjcVeXA+/L2+GEKZI4aw/4y0Rv9EaCkmuXm+hX5xGSCsd5Z3IYxjZJV QKbsV2STnVGdBuVy9oz3LCxfzEQRFwqBteN346P3cebVrjL5RG4c4 X-Received: by 2002:a17:902:dac9:b0:1bf:4582:90d with SMTP id q9-20020a170902dac900b001bf4582090dmr2918109plx.46.1695840901861; Wed, 27 Sep 2023 11:55:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFJYQUwXLJAbt5LHCuT+gn57q+qO5PexVYGSIkUpY/qykxjJqFVj6qpDWivxvS8WNWvLUddWQ== X-Received: by 2002:a17:902:dac9:b0:1bf:4582:90d with SMTP id q9-20020a170902dac900b001bf4582090dmr2918093plx.46.1695840901496; Wed, 27 Sep 2023 11:55:01 -0700 (PDT) Received: from localhost.localdomain ([2804:7f0:b443:4916:6ddb:a8a7:4981:59fe]) by smtp.gmail.com with ESMTPSA id d4-20020a170903230400b001bda42a216bsm13529998plh.100.2023.09.27.11.55.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 11:55:01 -0700 (PDT) From: Magali Lemes To: kernel-team@lists.ubuntu.com Subject: [SRU][Lunar][PATCH 2/2] UBUNTU: [Config] remove NET_CLS_RSVP and NET_CLS_RSVP6 Date: Wed, 27 Sep 2023 15:54:03 -0300 Message-Id: <20230927185403.112264-9-magali.lemes@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927185403.112264-1-magali.lemes@canonical.com> References: <20230927185403.112264-1-magali.lemes@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" As rsvp classifier is removed, update configs accordingly. CVE-2023-42755 Signed-off-by: Magali Lemes --- debian.master/abi/amd64/generic.modules | 2 -- debian.master/abi/arm64/generic-64k.modules | 2 -- debian.master/abi/arm64/generic.modules | 2 -- debian.master/abi/armhf/generic-lpae.modules | 2 -- debian.master/abi/armhf/generic.modules | 2 -- debian.master/abi/ppc64el/generic.modules | 2 -- debian.master/abi/s390x/generic.modules | 2 -- debian.master/config/annotations | 2 -- 8 files changed, 16 deletions(-) diff --git a/debian.master/abi/amd64/generic.modules b/debian.master/abi/amd64/generic.modules index f68f106ecc01..bd00228961f0 100644 --- a/debian.master/abi/amd64/generic.modules +++ b/debian.master/abi/amd64/generic.modules @@ -833,8 +833,6 @@ cls_flower cls_fw cls_matchall cls_route -cls_rsvp -cls_rsvp6 cls_u32 cm109 cm32181 diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules index 94044b5e80d5..8c87208c749c 100644 --- a/debian.master/abi/arm64/generic-64k.modules +++ b/debian.master/abi/arm64/generic-64k.modules @@ -923,8 +923,6 @@ cls_flower cls_fw cls_matchall cls_route -cls_rsvp -cls_rsvp6 cls_u32 cm109 cm32181 diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules index abc7e72f0ad3..12d920b1f18c 100644 --- a/debian.master/abi/arm64/generic.modules +++ b/debian.master/abi/arm64/generic.modules @@ -923,8 +923,6 @@ cls_flower cls_fw cls_matchall cls_route -cls_rsvp -cls_rsvp6 cls_u32 cm109 cm32181 diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules index b7b6757652db..e09b59d1b4af 100644 --- a/debian.master/abi/armhf/generic-lpae.modules +++ b/debian.master/abi/armhf/generic-lpae.modules @@ -889,8 +889,6 @@ cls_flower cls_fw cls_matchall cls_route -cls_rsvp -cls_rsvp6 cls_u32 cm109 cm32181 diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules index e32474950c08..ed209e690b0b 100644 --- a/debian.master/abi/armhf/generic.modules +++ b/debian.master/abi/armhf/generic.modules @@ -889,8 +889,6 @@ cls_flower cls_fw cls_matchall cls_route -cls_rsvp -cls_rsvp6 cls_u32 cm109 cm32181 diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules index 11bee8b0e6c3..29b294ba02b7 100644 --- a/debian.master/abi/ppc64el/generic.modules +++ b/debian.master/abi/ppc64el/generic.modules @@ -791,8 +791,6 @@ cls_flower cls_fw cls_matchall cls_route -cls_rsvp -cls_rsvp6 cls_u32 cm109 cm32181 diff --git a/debian.master/abi/s390x/generic.modules b/debian.master/abi/s390x/generic.modules index fbb91843e886..b1dd7d2501eb 100644 --- a/debian.master/abi/s390x/generic.modules +++ b/debian.master/abi/s390x/generic.modules @@ -112,8 +112,6 @@ cls_flower cls_fw cls_matchall cls_route -cls_rsvp -cls_rsvp6 cls_u32 cmac coda diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 63d80fb7969e..07e66789c1b3 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8310,8 +8310,6 @@ CONFIG_NET_CLS_FLOWER policy<{'amd64': 'm', 'arm64': ' CONFIG_NET_CLS_FW policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_NET_CLS_MATCHALL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_NET_CLS_ROUTE4 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> -CONFIG_NET_CLS_RSVP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> -CONFIG_NET_CLS_RSVP6 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_NET_CLS_U32 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}> CONFIG_NET_CORE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}> CONFIG_NET_DEVLINK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y', 's390x': 'y'}>