From mboxrd@z Thu Jan 1 00:00:00 1970 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 89FB6399015; Tue, 21 Jul 2026 19:40:40 +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=1784662841; cv=none; b=Y0607MwJX+iP5zVJ7IkPJdaKf9GIqNgDy8BCStnsyFhi8eAz2om+vWobx3nHfzw+AEcKUG/tcfBB/vIIBZDvj5v15rgPMWnqDO+fGtUxJZyvTq871+KYu0dEocI21YFcAtFBEmP+z5Enb7NNr9O+B15Mh+zPEYlfFJ1MPlN1bfw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784662841; c=relaxed/simple; bh=yv20qftbmhpAioCJ/Yecp9Av3IoHCto+LiYCixjtoKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gqEEmZm4Om8hxpccQq/XJBtTORk3dmEERVg6TGTdEajecNeMKE9iGEmvRBOIfQMndQk66yBiGR33NRcVMaf6rOUZcsETQgchtop6Am4MsC0RG3N+ofHJ2eqgMOQf5siIwkLsyPeP0jKKeElVOuR7/BNtz6c59QmGFRr4NVm0jSA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lvdfSC6q; 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="lvdfSC6q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFD761F000E9; Tue, 21 Jul 2026 19:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784662840; bh=j7nVKYvkWo5o4Qy/KR02K58rEHrkw7Ri+u62XiQNp0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lvdfSC6qgqaAFUkmwmvJ5LT97V6rUaeQP8HuY9oZtqodSZoh7MTgIqbSD5vMZROOo hi3UsM8je3CguylLwPAg4SmBn4Gxgcr2sv9BO25r0KupmXjr5I3U0YxIpmpqCkASYS XBrFXuc3udx/NKZVGMfeO+Wr4Le3c5g0ugkp1BqY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jozsef Kadlecsik , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.12 0595/1276] netfilter: ipset: fix order of kfree_rcu() and rcu_assign_pointer() Date: Tue, 21 Jul 2026 17:17:18 +0200 Message-ID: <20260721152459.430080595@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152446.065700225@linuxfoundation.org> References: <20260721152446.065700225@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jozsef Kadlecsik [ Upstream commit 3ca9982a8882470aa0ac4e8bb9a552b181d1efcd ] Sashiko pointed out that kfree_rcu() was called before rcu_assign_pointer() in handling the comment extension. Fix the order so that rcu_assign_pointer() called first. Fixes: b57b2d1fa53f ("netfilter: ipset: Prepare the ipset core to use RCU at set level") Signed-off-by: Jozsef Kadlecsik Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/ipset/ip_set_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c index 94157104d85a95..f51a1af31513cd 100644 --- a/net/netfilter/ipset/ip_set_core.c +++ b/net/netfilter/ipset/ip_set_core.c @@ -351,8 +351,8 @@ ip_set_init_comment(struct ip_set *set, struct ip_set_comment *comment, if (unlikely(c)) { set->ext_size -= sizeof(*c) + strlen(c->str) + 1; - kfree_rcu(c, rcu); rcu_assign_pointer(comment->c, NULL); + kfree_rcu(c, rcu); } if (!len) return; @@ -393,8 +393,8 @@ ip_set_comment_free(struct ip_set *set, void *ptr) if (unlikely(!c)) return; set->ext_size -= sizeof(*c) + strlen(c->str) + 1; - kfree_rcu(c, rcu); rcu_assign_pointer(comment->c, NULL); + kfree_rcu(c, rcu); } typedef void (*destroyer)(struct ip_set *, void *); -- 2.53.0