diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2005-11-14 18:28:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-14 18:28:45 -0500 |
commit | 302fe1758d85ad9c868e77625f61b7edad106381 (patch) | |
tree | b3b9a6a356c0f59f871d55353f727250a8c74e51 | |
parent | 1ba430bc3e243d38c0bb2b185bea664b04fc59df (diff) |
[NETFILTER] fix leak of fragment queue at unloading nf_conntrack_ipv6
This patch makes nf_conntrack_ipv6 free all IPv6 fragment queues at module
unloading time. Also introduce a BUG_ON if we ever again have leaks in
the memory accounting.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 1b68d714c0a4..c2c52af9e560 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c | |||
@@ -282,6 +282,7 @@ static void nf_ct_frag6_evictor(void) | |||
282 | return; | 282 | return; |
283 | } | 283 | } |
284 | tmp = nf_ct_frag6_lru_list.next; | 284 | tmp = nf_ct_frag6_lru_list.next; |
285 | BUG_ON(tmp == NULL); | ||
285 | fq = list_entry(tmp, struct nf_ct_frag6_queue, lru_list); | 286 | fq = list_entry(tmp, struct nf_ct_frag6_queue, lru_list); |
286 | atomic_inc(&fq->refcnt); | 287 | atomic_inc(&fq->refcnt); |
287 | read_unlock(&nf_ct_frag6_lock); | 288 | read_unlock(&nf_ct_frag6_lock); |
@@ -891,5 +892,6 @@ int nf_ct_frag6_init(void) | |||
891 | void nf_ct_frag6_cleanup(void) | 892 | void nf_ct_frag6_cleanup(void) |
892 | { | 893 | { |
893 | del_timer(&nf_ct_frag6_secret_timer); | 894 | del_timer(&nf_ct_frag6_secret_timer); |
895 | nf_ct_frag6_low_thresh = 0; | ||
894 | nf_ct_frag6_evictor(); | 896 | nf_ct_frag6_evictor(); |
895 | } | 897 | } |