diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2011-03-14 19:20:44 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-03-14 19:20:44 +0100 |
| commit | fe8f661f2c2bb058822f13f6f232e121bde1338f (patch) | |
| tree | 8843d8216022cddb23bc3de47e87e5e4d139a2d4 /net/netfilter | |
| parent | 42046e2e45c109ba703993c510401a11f716c8df (diff) | |
| download | linux-stable-fe8f661f2c2bb058822f13f6f232e121bde1338f.tar.gz linux-stable-fe8f661f2c2bb058822f13f6f232e121bde1338f.tar.bz2 linux-stable-fe8f661f2c2bb058822f13f6f232e121bde1338f.zip | |
netfilter: nf_conntrack: fix sysctl memory leak
Message in log because sysctl table was not empty at netns exit
WARNING: at net/sysctl_net.c:84 sysctl_net_exit+0x2a/0x2c()
Instrumenting showed that the nf_conntrack_timestamp was the entry
that was being created but not cleared.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 1909311c392a..118123606a21 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1294,6 +1294,7 @@ static void nf_conntrack_cleanup_net(struct net *net) nf_ct_free_hashtable(net->ct.hash, net->ct.htable_size); nf_conntrack_ecache_fini(net); + nf_conntrack_tstamp_fini(net); nf_conntrack_acct_fini(net); nf_conntrack_expect_fini(net); kmem_cache_destroy(net->ct.nf_conntrack_cachep); |