Skip to content

Commit

Permalink
netfilter: netns nf_conntrack: cleanup after L3 and L4 proto unregist…
Browse files Browse the repository at this point in the history
…er in every netns

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
  • Loading branch information
Alexey Dobriyan authored and Patrick McHardy committed Oct 8, 2008
1 parent 6804793 commit 678d667
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions net/netfilter/nf_conntrack_proto.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_register);

void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto)
{
struct net *net;

BUG_ON(proto->l3proto >= AF_MAX);

mutex_lock(&nf_ct_proto_mutex);
Expand All @@ -219,7 +221,8 @@ void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto)
synchronize_rcu();

/* Remove all contrack entries for this protocol */
nf_ct_iterate_cleanup(&init_net, kill_l3proto, proto);
for_each_net(net)
nf_ct_iterate_cleanup(net, kill_l3proto, proto);
}
EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_unregister);

Expand Down Expand Up @@ -316,6 +319,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_register);

void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *l4proto)
{
struct net *net;

BUG_ON(l4proto->l3proto >= PF_MAX);

mutex_lock(&nf_ct_proto_mutex);
Expand All @@ -328,7 +333,8 @@ void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *l4proto)
synchronize_rcu();

/* Remove all contrack entries for this protocol */
nf_ct_iterate_cleanup(&init_net, kill_l4proto, l4proto);
for_each_net(net)
nf_ct_iterate_cleanup(net, kill_l4proto, l4proto);
}
EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_unregister);

Expand Down

0 comments on commit 678d667

Please sign in to comment.