diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-08-09 11:19:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-09 11:31:37 +0200 |
| commit | 36471012e2ae28ca3178f84d4687a2d88a36593e (patch) | |
| tree | 0cb332bf74c90dcd3c4998c66367fd2c6c1c32e8 /net | |
| parent | net/stmmac: mark probe function as __devinit (diff) | |
| download | linux-36471012e2ae28ca3178f84d4687a2d88a36593e.tar.xz linux-36471012e2ae28ca3178f84d4687a2d88a36593e.zip | |
tcp: must free metrics at net dismantle
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/tcp_metrics.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index 2288a6399e1e..0abe67bb4d3a 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); } |