Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 DE00947F2CE; Thu, 20 Aug 2026 17:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787248593; cv=none; b=OC1DwC6CMzPtP/WLk3wi5MlMV1GMfiHUnU4PzPdH+yq3fLXtHWJeSk0x3p0H2PPCdlKp5UuREuvGmGmDC+krVdyHdVROh8JBzSN6RyIyTqX4qnLzS5rcyw1xU/JnDrToUy94g0mci6ihZ1k0neqmhees2vljL/zde/pEIdiRRuI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787248593; c=relaxed/simple; bh=Z2wTnBxhV5nXZ+JVG+mNEh8Jjtdb9Q/1PfxsiL23BQw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LfslOq4HPmCvZBDAivc3P/bnGWqZSfCOIPxsebBUpNEcGAv9+WuFl8czxNqIKaPBhYGAj2fY3PrzgpnaAOS4rOU5SEKKbrYUdPh4FO4Nr00pbfDRFcwQJN2fbME+4AMcc3EeFun/RMKjj459ccugBPmk4+8nX5s53N4SZrUOMmc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tIOiBP7P; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tIOiBP7P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03A1E1F000E9; Thu, 20 Aug 2026 17:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787248591; bh=s320Bd8mkhUUdjQj2V4TiS9RMnJFbOFwg9nuuRTSE9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tIOiBP7PuEy/QEHbpHZtg46Sr+Elq0rC/YqR/pO2Rjkr4i96FEw4dz2qW81DM6OXk iV8AwqrY9KYlnck799CtiPN5ZkKlSC9yCb4P82IOyz/BgkTAgDXzrJM5rocNKRyvEG XHnHrnzwSIhJY3gJH+9a+tWagxvSYUtvuAkHdqWk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Florian Westphal , Jozsef Kadlecsik , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.1 282/303] netfilter: ipset: fix list type element drift bug Date: Thu, 20 Aug 2026 16:56:58 +0200 Message-ID: <20260820145301.940391160@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145253.200766705@linuxfoundation.org> References: <20260820145253.200766705@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal [ Upstream commit 4cbd69766b35a089664cadb1f613bb85f7ef77a9 ] If list_set_uadd() calls list_set_replace() to swap an expired entry, the element count remains the same, therefore the increment must be elided. Fixes: 702b71e7c666 ("netfilter: ipset: Add element count to all set types header") Link: https://sashiko.dev/#/patchset/20260806101947.2802-1-fw%40strlen.de Signed-off-by: Florian Westphal Acked-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/ipset/ip_set_list_set.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c index bc37bc59e2828..848fbafd2593d 100644 --- a/net/netfilter/ipset/ip_set_list_set.c +++ b/net/netfilter/ipset/ip_set_list_set.c @@ -301,9 +301,12 @@ list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext, e->set = set; INIT_LIST_HEAD(&e->list); list_set_init_extensions(set, ext, e); - if (n) + if (n) { list_set_replace(set, e, n); - else if (next) + return 0; + } + + if (next) list_add_tail_rcu(&e->list, &next->list); else if (prev) list_add_rcu(&e->list, &prev->list); -- 2.53.0