diff options
| author |   Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2005-11-14 15:28:45 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2005-11-14 15:28:45 -0800 |
| commit | 302fe1758d85ad9c868e77625f61b7edad106381 (patch) | |
| tree | b3b9a6a356c0f59f871d55353f727250a8c74e51 /net | |
| parent | [NETFILTER] nf_conntrack: fix possibility of infinite loop while evicting nf_ct_frag6_queue (diff) | |
| download | linux-dev-302fe1758d85ad9c868e77625f61b7edad106381.tar.xz linux-dev-302fe1758d85ad9c868e77625f61b7edad106381.zip | |
[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>
Diffstat (limited to '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) return; } tmp = nf_ct_frag6_lru_list.next; + BUG_ON(tmp == NULL); fq = list_entry(tmp, struct nf_ct_frag6_queue, lru_list); atomic_inc(&fq->refcnt); read_unlock(&nf_ct_frag6_lock); @@ -891,5 +892,6 @@ int nf_ct_frag6_init(void) void nf_ct_frag6_cleanup(void) { del_timer(&nf_ct_frag6_secret_timer); + nf_ct_frag6_low_thresh = 0; nf_ct_frag6_evictor(); } |