From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=217.70.190.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793714611; b=KNP8R+RIjBhzUpCgzczwFmyRy85wUgGKQ1RRaPpf4ap0/ANQ48d2LdQi9fzGyIJJ7y57 JPylEXsuaKn55IhXr/T39ncnQPQN3ytEe+tO84IDPcXU0HMqPMMlNA/nVaE91YqgnR4Du ZWqOueBgwwBLGoIM3RUVvMxRiRHQlrZR4OauBmdKxbjHMej8eTSO/5jTxs2mutuEmrK+N lXZVZDs/wMxlFsn24hTB7vqi07x5WoQSxQZoHedD0a3kKjunylnf1F41Ojc50zQuj+Aa7 ETL6lSuMOV/vB24DSZr0G1Tj9+ygWQFjMJKegNYHcxFWKn212Dv9IyjKI+K60oa1Tgg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793714611; h=DMARC-Filter:DKIM-Signature:Received:From:To:Cc:Subject:Date: Message-ID:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Spam-Status:X-Spam-Checker-Version; bh=eI6BYAMtH8gnpfLqrP2oq7QPLneAgWxxYSCOTNnXMiM=; b=nRNPLYsbxUzfRq04pjJV0LctemQLPZTNQSUQFIKefA5G873R2//3CHse7YGQTHNP0RGV 5qN+rMvuPV0PHk6i4zsOXVsL/xa+MrTXXvMd3miE6zC6fxzoYbWkPjligiPUyqKesHCWo DjvQwI+e6XFF+jvP40QInTzgtxVJbBvpAgDniIi3nMcCQWTsOAJYunUrddU9loxFqDbMs O2Lh0ypgpFpJeS5rZDBVGyJn9zjSbPZjSEl9LC5y6bELhLH2Dl6Do796YtMvabkhK0dJI 8UBNQAKJxoLRsKGPxt77QeYLMNwZ9X3tzICIgG6BhJ6znbeVvMZ7TTv5ef0lYqgqphQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=netfilter.org; spf=pass smtp.mailfrom=netfilter.org; dkim=pass header.d=netfilter.org header.i=@netfilter.org header.a=rsa-sha256 header.s=2025 header.b=FgRdG9pM; arc=none smtp.remote-ip=217.70.190.124 Received: from mail.netfilter.org (mail.netfilter.org [217.70.190.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 345116085083; Tue, 3 Nov 2026 14:03:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 345116085083 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=netfilter.org header.i=@netfilter.org header.a=rsa-sha256 header.s=2025 header.b=FgRdG9pM DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org; s=2025; t=1793714609; bh=eI6BYAMtH8gnpfLqrP2oq7QPLneAgWxxYSCOTNnXMiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FgRdG9pM8SB60UbT7ML/pt/DAONouZayuihH4DBpvJYlI+rlrWU3y9JItN4KwGpxm KfjpW4sGYrg9LhWlN1WcvPNW9kEPkg1jgHJ7YGgLqkO0jSt/l7lrekHTG8F9nuqF4Q 6hsR4dzA27/HhSJhxKkAvHOLukXR2fOSWXB7uL/CCYsJx7saFL8JR/5DtzG5y5DjLg 5bf2APN0udMfaj058C/w42SWb/XkDg2+8Gsue6T0abIv5rHoCkX8pPGy5zjaJPGOnH USTOlkFkp9CLVKUBLNGltQxHGyQNYkax4rfwB6KHKHeBqbR7F2TRTrrGxmUkGcs7jr zItIZXqvjf4AQ== Received: from localhost.localdomain (mail-agni [217.70.190.124]) by mail.netfilter.org (Postfix) with ESMTPSA id DC9D360090; Tue, 3 Nov 2026 15:03:28 +0100 (CET) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org, pabeni@redhat.com, edumazet@kernel.org, horms@kernel.org, fw@strlen.de, ja@ssi.bg Subject: [PATCH net 09/15] netfilter: nft_set_rbtree: check catchall_sync return before queue_done Date: Tue, 3 Nov 2026 15:03:02 +0100 Message-ID: <20261103140308.591690-11-pablo@netfilter.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261103140308.591690-1-pablo@netfilter.org> References: <20261103140308.591690-1-pablo@netfilter.org> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Xingyuan Mo nft_rbtree_gc_queue() passes the result of nft_trans_gc_catchall_sync() straight to nft_trans_gc_queue_sync_done(). When the catchall path flushes a full GC batch and nft_trans_gc_alloc() fails, catchall_sync returns NULL and queue_sync_done dereferences trans->net (NULL+0x10). Guard the call like the pipapo GC path already does. Fixes: 7d259f021aaa ("netfilter: nft_set_rbtree: prefer sync gc to async worker") Assisted-by: opencode:deepseek-v4 Signed-off-by: Xingyuan Mo Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nft_set_rbtree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c index fbe1750f1ca2..9d685899da70 100644 --- a/net/netfilter/nft_set_rbtree.c +++ b/net/netfilter/nft_set_rbtree.c @@ -953,7 +953,8 @@ static void nft_rbtree_gc_queue(struct nft_set *set) } gc = nft_trans_gc_catchall_sync(gc); - nft_trans_gc_queue_sync_done(gc); + if (gc) + nft_trans_gc_queue_sync_done(gc); } static u64 nft_rbtree_privsize(const struct nlattr * const nla[], -- 2.47.3