Patchwork tcp: must free metrics at net dismantle

login
register
mail settings
Submitter Eric Dumazet
Date Aug. 9, 2012, 9:19 a.m.
Message ID <1344503953.28967.575.camel@edumazet-glaptop>
Download mbox | patch
Permalink /patch/176033/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric Dumazet - Aug. 9, 2012, 9:19 a.m.
From: Eric Dumazet <edumazet@google.com>

We currently leak all tcp metrics at struct net dismantle time.

tcp_net_metrics_exit() frees the hash table, we must first
iterate it to free all metrics.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/ipv4/tcp_metrics.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)



--
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
David Miller - Aug. 9, 2012, 9:31 a.m.
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 09 Aug 2012 11:19:13 +0200

> From: Eric Dumazet <edumazet@google.com>
> 
> We currently leak all tcp metrics at struct net dismantle time.
> 
> tcp_net_metrics_exit() frees the hash table, we must first
> iterate it to free all metrics.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Applied, thanks Eric.
--
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

Patch

diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index 2288a63..0abe67b 100644
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -731,6 +731,18 @@  static int __net_init tcp_net_metrics_init(struct net *net)
 
 static void __net_exit tcp_net_metrics_exit(struct net *net)
 {
+	unsigned int i;
+
+	for (i = 0; i < (1U << net->ipv4.tcp_metrics_hash_log) ; i++) {
+		struct tcp_metrics_block *tm, *next;
+
+		tm = rcu_dereference_protected(net->ipv4.tcp_metrics_hash[i].chain, 1);
+		while (tm) {
+			next = rcu_dereference_protected(tm->tcpm_next, 1);
+			kfree(tm);
+			tm = next;
+		}
+	}
 	kfree(net->ipv4.tcp_metrics_hash);
 }