---

yaml --- r: 178134 b: refs/heads/master c: 3705e11 h: refs/heads/master v: v3
git-mirror · Dec 19, 2009 · 91aa467 · 91aa467
1 parent 60670d7
commit 91aa467
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;