diff mbox

conntrack: fix sysctl memory leak

Message ID 20110310101422.62006620@nehalam
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

stephen hemminger March 10, 2011, 6:14 p.m. UTC
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>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Patrick McHardy March 14, 2011, 6:21 p.m. UTC | #1
On 10.03.2011 19:14, Stephen Hemminger wrote:
> 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.

Applied, thanks Stephen.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- a/net/netfilter/nf_conntrack_core.c	2011-03-10 09:42:10.656565623 -0800
+++ b/net/netfilter/nf_conntrack_core.c	2011-03-10 09:42:30.652821904 -0800
@@ -1301,6 +1301,7 @@  static void nf_conntrack_cleanup_net(str
 
 	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);