From patchwork Wed Sep 27 18:54:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magali Lemes X-Patchwork-Id: 1840391 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 4Rwm634d4fz1yp0 for ; Thu, 28 Sep 2023 04:55:55 +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 1qlZhI-0004N4-M4; Wed, 27 Sep 2023 18:55:44 +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 1qlZgd-0003yV-97 for kernel-team@lists.ubuntu.com; Wed, 27 Sep 2023 18:55:04 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.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 6169D3F044 for ; Wed, 27 Sep 2023 18:55:02 +0000 (UTC) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-2764e63b6abso15849706a91.0 for ; Wed, 27 Sep 2023 11:55:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695840899; x=1696445699; 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=KeoI5HiObVds4osHhnkIJcnToSxhVlpHW77fCQDUrk4=; b=QuV/ue7Jru9DWHfann4Lx2GjF7/bjgeOjAbcHUTBtKUJNqt3hd5GQ7OVj8nfgBIv4l FVlGcNj5KY0+lI+bZjvD8zvsFg7wglaH+S7IMcp7zIenYS3W9Xn48WLmLL99n9beEefM ux7HgjDkt/o7x3FXoLBKgtslYdbz89N0w9ZWRUYFnBD/qvx5BSniLOrGZwDN8a2suBoK I7DKZU/b3rMrTcBRg8yCNz1FYGPMeNkeClyD2GtCvdIRb8V7a6vRPZk08inH4UHOr4+y 2qcKKCxI5GNgy6gI0pWvKb+eKwy0J3V6k+QFIt5lBOwzcsIiTh6zJ1li4eXtWvBStwkv hG7w== X-Gm-Message-State: AOJu0YwkGZ2Srt0VE9RqM9R7fLlNMMsOhjsG0of+6O2tqjyxs59Gh2YN nhnq4P8PwVaXM3tmCThN1B39xFYrAcqnaiMFWGjqS6TKdp0fsEn9JbzloOAZGVo6gqUibfX91+P wyQ8OU/DCCvkMsDba7wJMBKVM1ZpawWB1EQcUgGOKaszRDTC1ZUVa X-Received: by 2002:a17:902:a40b:b0:1b8:4f93:b210 with SMTP id p11-20020a170902a40b00b001b84f93b210mr2267834plq.45.1695840899141; Wed, 27 Sep 2023 11:54:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8p2VRhUXN0ap98rvjlYl+KEF4ZcviXMVY6tAKrRUKoRVdOpFwtEbGnCf6cevn8ggdeUSPeQ== X-Received: by 2002:a17:902:a40b:b0:1b8:4f93:b210 with SMTP id p11-20020a170902a40b00b001b84f93b210mr2267823plq.45.1695840898779; Wed, 27 Sep 2023 11:54:58 -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.54.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 11:54:58 -0700 (PDT) From: Magali Lemes To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy][PATCH 2/2] UBUNTU: [Config] remove NET_CLS_RSVP and NET_CLS_RSVP6 Date: Wed, 27 Sep 2023 15:54:01 -0300 Message-Id: <20230927185403.112264-7-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 0d0b6cbf9765..2c16ebcb8c61 100644 --- a/debian.master/abi/amd64/generic.modules +++ b/debian.master/abi/amd64/generic.modules @@ -802,8 +802,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 df5ee8bb7e85..46a54ba28792 100644 --- a/debian.master/abi/arm64/generic-64k.modules +++ b/debian.master/abi/arm64/generic-64k.modules @@ -877,8 +877,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 191a83723340..4ce0ce4f8711 100644 --- a/debian.master/abi/arm64/generic.modules +++ b/debian.master/abi/arm64/generic.modules @@ -877,8 +877,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 ced05445cb22..1812d9ef4c7b 100644 --- a/debian.master/abi/armhf/generic-lpae.modules +++ b/debian.master/abi/armhf/generic-lpae.modules @@ -828,8 +828,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 235d4b617b52..72a0f3f2a477 100644 --- a/debian.master/abi/armhf/generic.modules +++ b/debian.master/abi/armhf/generic.modules @@ -837,8 +837,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 6eef96cf1c80..51ef2d8956ad 100644 --- a/debian.master/abi/ppc64el/generic.modules +++ b/debian.master/abi/ppc64el/generic.modules @@ -758,8 +758,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 e8e97a92a227..a2a7b262efb0 100644 --- a/debian.master/abi/s390x/generic.modules +++ b/debian.master/abi/s390x/generic.modules @@ -110,8 +110,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 0ccde23f179d..f8624d0738af 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -8016,8 +8016,6 @@ CONFIG_NET_CLS_FLOWER policy<{'amd64': 'm', 'arm64': ' CONFIG_NET_CLS_FW policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_NET_CLS_MATCHALL policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> CONFIG_NET_CLS_ROUTE4 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_NET_CLS_RSVP policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> -CONFIG_NET_CLS_RSVP6 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'}> CONFIG_NET_CORE policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}> CONFIG_NET_DEVLINK policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>