From 9fb76f60067ec01366d78f13a737af75b7debcbe Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Fri, 29 Feb 2008 14:15:19 -0800
Subject: [PATCH] --- yaml --- r: 89982 b: refs/heads/master c:
 1d1c8d13c4f7690d382bca5de2f9dc88f22a4aab h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/icmp.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 83d7e43a25e1..8188298bf5c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a80f2788952055a627f2093a0174537d70aec1b
+refs/heads/master: 1d1c8d13c4f7690d382bca5de2f9dc88f22a4aab
diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c
index b51f4b0a3264..cee77d606fbe 100644
--- a/trunk/net/ipv4/icmp.c
+++ b/trunk/net/ipv4/icmp.c
@@ -1198,7 +1198,9 @@ int __net_init icmp_sk_init(struct net *net)
 	return 0;
 
 fail:
-	icmp_sk_exit(net);
+	for_each_possible_cpu(i)
+		sk_release_kernel(net->ipv4.icmp_sk[i]);
+	kfree(net->ipv4.icmp_sk);
 	return err;
 }