From patchwork Mon Aug 12 10:23:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 1971501 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=vger.kernel.org (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-3206-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wj9bG5F7Dz1yYC for ; Mon, 12 Aug 2024 20:23:38 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 423B3B20C62 for ; Mon, 12 Aug 2024 10:23:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1672E16EBFC; Mon, 12 Aug 2024 10:23:32 +0000 (UTC) X-Original-To: netfilter-devel@vger.kernel.org Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A7CE133C7; Mon, 12 Aug 2024 10:23:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.188.207 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723458211; cv=none; b=JNsUnK0Anelvsy46zMV5rtwqMUQ/9eznmfO33aDJciceCegBtaSASXyR0F5o8WYGjM/bGk9fJ8SVFYj5S7eeRlrobysXJh2crIvM5Yx79Gp3X48Tv0mWaUc5MQtWLCSx1EVSfYrKEb3cphdxhIJc0zivGDuC0IPfSLNOdO/xrTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723458211; c=relaxed/simple; bh=sS+vTrpGdf0AvaZa1f6k9mClxZ1Q2o+sA6AqYegxzwQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=BoVrtvq6ka+ygIYzXsDdtuCE5PZlkYTBjwSYsGOWzYF2m84fM8rRQ0SMBZFoHRmiGDTLOY1m71xq312ql20Ma9VOch1uOdu8HZkY3BY2Pa8MGAaa9SRs5HvTijRP328Rh7exzIs3V7P2Mp9mJy0Eord52utyIiuDnot567EkUBQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; arc=none smtp.client-ip=217.70.188.207 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=netfilter.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=netfilter.org From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org Subject: [PATCH -stable,6.1.x 0/3] Netfilter fixes for -stable Date: Mon, 12 Aug 2024 12:23:17 +0200 Message-Id: <20240812102320.359247-1-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi Greg, Sasha, This batch contains a backport for recent fixes already upstream for 6.1.x. The following list shows the backported patches, I am using original commit IDs for reference: 1) 3c13725f43dc ("netfilter: nf_tables: bail out if stateful expression provides no .clone") 2) fa23e0d4b756 ("netfilter: nf_tables: allow clone callbacks to sleep") 3) cff3bd012a95 ("netfilter: nf_tables: prefer nft_chain_validate") Please, apply, Thanks Florian Westphal (2): netfilter: nf_tables: allow clone callbacks to sleep netfilter: nf_tables: prefer nft_chain_validate Pablo Neira Ayuso (1): netfilter: nf_tables: bail out if stateful expression provides no .clone include/net/netfilter/nf_tables.h | 4 +- net/netfilter/nf_tables_api.c | 172 ++++-------------------------- net/netfilter/nft_connlimit.c | 4 +- net/netfilter/nft_counter.c | 4 +- net/netfilter/nft_dynset.c | 2 +- net/netfilter/nft_last.c | 4 +- net/netfilter/nft_limit.c | 14 +-- net/netfilter/nft_quota.c | 4 +- 8 files changed, 42 insertions(+), 166 deletions(-)