aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_nat_masquerade.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2021-12-13 08:40:00 -0800
committerPablo Neira Ayuso <pablo@netfilter.org>2021-12-16 12:49:34 +0100
commitfc0d026a2fadd3a637677efa2e8bd3b70403f4aa (patch)
tree31b15f8d1b6a8a030091febbc5e1540f33d5c02d /net/netfilter/nf_nat_masquerade.c
parentnetfilter: nfnetlink: add netns refcount tracker to struct nfulnl_instance (diff)
downloadlinux-dev-fc0d026a2fadd3a637677efa2e8bd3b70403f4aa.tar.xz
linux-dev-fc0d026a2fadd3a637677efa2e8bd3b70403f4aa.zip
netfilter: nf_nat_masquerade: add netns refcount tracker to masq_dev_work
If compiled with CONFIG_NET_NS_REFCNT_TRACKER=y, using put_net_track() in iterate_cleanup_work() and netns_tracker_alloc() in nf_nat_masq_schedule() might help us finding netns refcount imbalances. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to '')
-rw-r--r--net/netfilter/nf_nat_masquerade.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nf_nat_masquerade.c b/net/netfilter/nf_nat_masquerade.c
index acd73f717a08..e32fac374608 100644
--- a/net/netfilter/nf_nat_masquerade.c
+++ b/net/netfilter/nf_nat_masquerade.c
@@ -12,6 +12,7 @@
struct masq_dev_work {
struct work_struct work;
struct net *net;
+ netns_tracker ns_tracker;
union nf_inet_addr addr;
int ifindex;
int (*iter)(struct nf_conn *i, void *data);
@@ -82,7 +83,7 @@ static void iterate_cleanup_work(struct work_struct *work)
nf_ct_iterate_cleanup_net(w->net, w->iter, (void *)w, 0, 0);
- put_net(w->net);
+ put_net_track(w->net, &w->ns_tracker);
kfree(w);
atomic_dec(&masq_worker_count);
module_put(THIS_MODULE);
@@ -119,6 +120,7 @@ static void nf_nat_masq_schedule(struct net *net, union nf_inet_addr *addr,
INIT_WORK(&w->work, iterate_cleanup_work);
w->ifindex = ifindex;
w->net = net;
+ netns_tracker_alloc(net, &w->ns_tracker, gfp_flags);
w->iter = iter;
if (addr)
w->addr = *addr;