diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-08 05:35:07 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 05:35:07 -0400 |
| commit | 678d66753091a4102910392fb6198a6c6ce7f510 (patch) | |
| tree | c1198f2f753f7c0934992f4b99d08ff814eefc46 /net | |
| parent | 68047937677f2dffb5c47b57ce8baba5714b2142 (diff) | |
netfilter: netns nf_conntrack: cleanup after L3 and L4 proto unregister in every netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c index 3a2f7ef997f4..a59a307e685d 100644 --- a/net/netfilter/nf_conntrack_proto.c +++ b/net/netfilter/nf_conntrack_proto.c | |||
| @@ -207,6 +207,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_register); | |||
| 207 | 207 | ||
| 208 | void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto) | 208 | void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto) |
| 209 | { | 209 | { |
| 210 | struct net *net; | ||
| 211 | |||
| 210 | BUG_ON(proto->l3proto >= AF_MAX); | 212 | BUG_ON(proto->l3proto >= AF_MAX); |
| 211 | 213 | ||
| 212 | mutex_lock(&nf_ct_proto_mutex); | 214 | mutex_lock(&nf_ct_proto_mutex); |
| @@ -219,7 +221,8 @@ void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto) | |||
| 219 | synchronize_rcu(); | 221 | synchronize_rcu(); |
| 220 | 222 | ||
| 221 | /* Remove all contrack entries for this protocol */ | 223 | /* Remove all contrack entries for this protocol */ |
| 222 | nf_ct_iterate_cleanup(&init_net, kill_l3proto, proto); | 224 | for_each_net(net) |
| 225 | nf_ct_iterate_cleanup(net, kill_l3proto, proto); | ||
| 223 | } | 226 | } |
| 224 | EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_unregister); | 227 | EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_unregister); |
| 225 | 228 | ||
| @@ -316,6 +319,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_register); | |||
| 316 | 319 | ||
| 317 | void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *l4proto) | 320 | void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *l4proto) |
| 318 | { | 321 | { |
| 322 | struct net *net; | ||
| 323 | |||
| 319 | BUG_ON(l4proto->l3proto >= PF_MAX); | 324 | BUG_ON(l4proto->l3proto >= PF_MAX); |
| 320 | 325 | ||
| 321 | mutex_lock(&nf_ct_proto_mutex); | 326 | mutex_lock(&nf_ct_proto_mutex); |
| @@ -328,7 +333,8 @@ void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *l4proto) | |||
| 328 | synchronize_rcu(); | 333 | synchronize_rcu(); |
| 329 | 334 | ||
| 330 | /* Remove all contrack entries for this protocol */ | 335 | /* Remove all contrack entries for this protocol */ |
| 331 | nf_ct_iterate_cleanup(&init_net, kill_l4proto, l4proto); | 336 | for_each_net(net) |
| 337 | nf_ct_iterate_cleanup(net, kill_l4proto, l4proto); | ||
| 332 | } | 338 | } |
| 333 | EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_unregister); | 339 | EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_unregister); |
| 334 | 340 | ||