From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 469392DCF41; Wed, 8 Apr 2026 18:36:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673418; cv=none; b=u5B+coGY4e2w/v05g3Z4ne/51U2EF8rn/w7RpQfeOADMhskP9t0IIEOQvrPpf9rh8LL9zEEv8GiuIcEbV7heINWNxUBtpfSU8r6la/twJiMAPgh1ZZyVPe7COYJWlP3l24+Qz5vx/g36ojSVHqhOLqRnLVtrNKbZxwWYz9J6I60= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673418; c=relaxed/simple; bh=2dPisTgI3CZzyg4v4j6FsJ44MKDQUFeM6kedc+zaGHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mxNOI9e0kpYEuY7niM6cE4AeAdqm3/k9EovcMR6Knszog0uBOroDwSh+obK44brrQMZ4lmNnxXbNAKAHdAIWh8Hi/VUvW1qrseUAcR0n6NMLInlddYcoTcHa2nZV4t+k0xZviF4y9qm7uBxHgw4C9gr7n3Mxzn+ukx4ntinZaEA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=k5ugzoVd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="k5ugzoVd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D013DC19425; Wed, 8 Apr 2026 18:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775673418; bh=2dPisTgI3CZzyg4v4j6FsJ44MKDQUFeM6kedc+zaGHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k5ugzoVdEKl067VoZloZuzaZf7iNNIp16EbUW+93PulxlnlTX+I8jq7HjcRtLWdmI 5vfWf9q8wa/B6gBuRkCHRPk5qGSfAoDVCPifnNxrHxFKPvY2MmC7PG4paFjk1PLlMK 06w7s7f4XfgupoZaHalBxq73G6ysg3KEVz4mcQUQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Juefei Pu , Xin Liu , Yifan Wu , Yuan Tan , Phil Sutter , Pablo Neira Ayuso Subject: [PATCH 6.18 225/277] netfilter: ipset: drop logically empty buckets in mtype_del Date: Wed, 8 Apr 2026 20:03:30 +0200 Message-ID: <20260408175942.257859303@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175933.836769063@linuxfoundation.org> References: <20260408175933.836769063@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yifan Wu commit 9862ef9ab0a116c6dca98842aab7de13a252ae02 upstream. mtype_del() counts empty slots below n->pos in k, but it only drops the bucket when both n->pos and k are zero. This misses buckets whose live entries have all been removed while n->pos still points past deleted slots. Treat a bucket as empty when all positions below n->pos are unused and release it directly instead of shrinking it further. Fixes: 8af1c6fbd923 ("netfilter: ipset: Fix forceadd evaluation path") Cc: stable@vger.kernel.org Reported-by: Juefei Pu Reported-by: Xin Liu Signed-off-by: Yifan Wu Co-developed-by: Yuan Tan Signed-off-by: Yuan Tan Reviewed-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/ipset/ip_set_hash_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h @@ -1099,7 +1099,7 @@ mtype_del(struct ip_set *set, void *valu if (!test_bit(i, n->used)) k++; } - if (n->pos == 0 && k == 0) { + if (k == n->pos) { t->hregion[r].ext_size -= ext_size(n->size, dsize); rcu_assign_pointer(hbucket(t, key), NULL); kfree_rcu(n, rcu);