From 91aa467bd47dcde59b68d605d107f7cfbe1b5b30 Mon Sep 17 00:00:00 2001
From: Yang Hongyang <yanghy@cn.fujitsu.com>
Date: Fri, 18 Dec 2009 20:25:13 -0800
Subject: [PATCH] --- yaml --- r: 178134 b: refs/heads/master c:
 3705e11a21bcdffe7422ee7870e1b23fe4ac70f4 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/reassembly.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 78544a859179..b41ec5830cb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9c4171e01f6befdf5d15346070b819d341c9c73
+refs/heads/master: 3705e11a21bcdffe7422ee7870e1b23fe4ac70f4
diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c
index 3b3a95607125..2cddea3bd6be 100644
--- a/trunk/net/ipv6/reassembly.c
+++ b/trunk/net/ipv6/reassembly.c
@@ -708,7 +708,8 @@ static void ip6_frags_ns_sysctl_unregister(struct net *net)
 
 	table = net->ipv6.sysctl.frags_hdr->ctl_table_arg;
 	unregister_net_sysctl_table(net->ipv6.sysctl.frags_hdr);
-	kfree(table);
+	if (!net_eq(net, &init_net))
+		kfree(table);
 }
 
 static struct ctl_table_header *ip6_ctl_header;