]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
netfilter: ctnetlink: use nf_ct_exp_net() in expectation dump
authorPratham Gupta <pratham36gupta@gmail.com>
Tue, 5 May 2026 05:11:57 +0000 (22:11 -0700)
committerFlorian Westphal <fw@strlen.de>
Sun, 24 May 2026 20:55:47 +0000 (22:55 +0200)
Commit 02a3231b6d82 ("netfilter: nf_conntrack_expect: store netns and zone in expectation")
introduced exp->net so RCU-only expectation paths no longer need to
dereference exp->master for netns lookups.

Commit 3db5647984de ("netfilter: nf_conntrack_expect: skip expectations in other netns via proc")
updated the proc path accordingly, but ctnetlink_exp_dump_table() still
compares against nf_ct_net(exp->master).

Use nf_ct_exp_net(exp) here as well so the netlink dump path matches
the rest of the March 2026 expectation netns/RCU cleanup.

Fixes: 02a3231b6d82 ("netfilter: nf_conntrack_expect: store netns and zone in expectation")
Cc: stable@vger.kernel.org
Signed-off-by: Pratham Gupta <pratham36gupta@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
net/netfilter/nf_conntrack_netlink.c

index befa7e83ee49f53a8a5b9c2d32d020c61ca66ae5..d429f9c9546cd95b4e38e3edc320c7b4ce64c451 100644 (file)
@@ -3173,7 +3173,7 @@ restart:
                        if (l3proto && exp->tuple.src.l3num != l3proto)
                                continue;
 
-                       if (!net_eq(nf_ct_net(exp->master), net))
+                       if (!net_eq(nf_ct_exp_net(exp), net))
                                continue;
 
                        if (cb->args[1]) {