netfilter: conntrack: add nf_ct_iter_data object for nf_ct_iterate_cleanup*()
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: conntrack: add nf_ct_iter_data object for nf_ct_iterate_cleanup*()
This patch adds a structure to collect all the context data that is passed to the cleanup iterator.
struct nf_ct_iter_data {
struct net *net;
void *data;
u32 portid;
int report;};
There is a netns field that allows to clean up conntrack entries specifically owned by the specified netns.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/net/netfilter/nf_conntrack.h | 12 ++++-- net/netfilter/nf_conntrack_core.c | 56 +++++++++++----------------- net/netfilter/nf_conntrack_netlink.c | 10 ++++- net/netfilter/nf_conntrack_proto.c | 10 +++-- net/netfilter/nf_conntrack_timeout.c | 7 +++- net/netfilter/nf_nat_masquerade.c | 5 ++- 6 files changed, 56 insertions(+), 44 deletions(-)
include/net/netfilter/nf_conntrack.h +9 -3
@@ -236,10 +236,16 @@ static inline bool nf_ct_kill(struct nf_conn *ct)return nf_ct_delete (ct,0 ,0 ); } +struct nf_ct_iter_data { +struct net *net; +void *data; +u32 portid; +int report; +}; +/* Iterate over all conntracks: if iter returns true, it's deleted. */ -void nf_ct_iterate_cleanup_net (struct net *net, -int (*iter)(struct nf_conn *i,void *data), -void *data,u32 portid,int report); +void nf_ct_iterate_cleanup_net (int (*iter)(struct nf_conn *i,void *data), +const struct nf_ct_iter_data *iter_data);/* also set unconfirmed conntracks as dying. Only use in module exit path. */ void nf_ct_iterate_destroy(int (*iter)(struct nf_conn *i, void *data),
net/netfilter/nf_conntrack_core.c +22 -34
127 lines not on this page · raw message
net/netfilter/nf_conntrack_netlink.c +8 -2
@@ -1559,6 +1559,11 @@ static int ctnetlink_flush_conntrack(struct net *net, u32 portid, int report, u8 family) { struct ctnetlink_filter *filter = NULL; +struct nf_ct_iter_data iter = { + .net = net, + .portid = portid, + .report = report, + };if (ctnetlink_needs_filter (family, cda)) {if (cda[CTA_FILTER ])
@@ -1567,10 +1572,11 @@ static int ctnetlink_flush_conntrack(struct net *net, filter =ctnetlink_alloc_filter (cda, family);if (IS_ERR (filter))return PTR_ERR (filter); + + iter.data = filter; } -nf_ct_iterate_cleanup_net (net, ctnetlink_flush_iterate, filter, - portid, report); +nf_ct_iterate_cleanup_net (ctnetlink_flush_iterate, &iter);kfree (filter);return 0 ;
net/netfilter/nf_conntrack_proto.c +7 -3
@@ -538,9 +538,13 @@ static int nf_ct_netns_do_get(struct net *net, u8 nfproto) out_unlock:mutex_unlock (&nf_ct_proto_mutex); -if (fixup_needed) -nf_ct_iterate_cleanup_net (net, nf_ct_tcp_fixup, - (void *)(unsigned long )nfproto,0 ,0 ); +if (fixup_needed) { +struct nf_ct_iter_data iter_data = { + .net = net, + .data = (void *)(unsigned long )nfproto, + }; +nf_ct_iterate_cleanup_net (nf_ct_tcp_fixup, &iter_data); + }return err; }
net/netfilter/nf_conntrack_timeout.c +6 -1
@@ -38,7 +38,12 @@ static int untimeout(struct nf_conn *ct, void *timeout)void nf_ct_untimeout (struct net *net,struct nf_ct_timeout *timeout) { -nf_ct_iterate_cleanup_net (net, untimeout, timeout,0 ,0 ); +struct nf_ct_iter_data iter_data = { + .net = net, + .data = timeout, + }; + +nf_ct_iterate_cleanup_net (untimeout, &iter_data); }EXPORT_SYMBOL_GPL (nf_ct_untimeout);
net/netfilter/nf_nat_masquerade.c +4 -1
@@ -77,11 +77,14 @@ EXPORT_SYMBOL_GPL(nf_nat_masquerade_ipv4);static void iterate_cleanup_work (struct work_struct *work) { +struct nf_ct_iter_data iter_data = {};struct masq_dev_work *w; w = container_of(work, struct masq_dev_work, work); -nf_ct_iterate_cleanup_net (w->net, w->iter, (void *)w,0 ,0 ); + iter_data.net = w->net; + iter_data.data = (void *)w; +nf_ct_iterate_cleanup_net (w->iter, &iter_data);put_net_track (w->net, &w->ns_tracker);kfree (w);
Signature · 1 line
2.30.2