From ab8b70fa4c0ca6ecfa81389bdd538b16eca8af71 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 28 Jul 2009 02:36:15 +0000
Subject: [PATCH] --- yaml --- r: 156341 b: refs/heads/master c:
 144586301f6af5ae5943a002f030d8c626fa4fdd h: refs/heads/master i:   156339:
 aefa51ab54c83eb532aa47912032621f5e292fe8 v: v3

---
 [refs]                         | 2 +-
 trunk/net/core/net_namespace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4053d5b78a87..d87d563f2e2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 446e72f30eca76d6f9a1a54adf84d2c6ba2831f8
+refs/heads/master: 144586301f6af5ae5943a002f030d8c626fa4fdd
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
index b7292a2719dc..197283072cc8 100644
--- a/trunk/net/core/net_namespace.c
+++ b/trunk/net/core/net_namespace.c
@@ -488,7 +488,7 @@ int net_assign_generic(struct net *net, int id, void *data)
 	 */
 
 	ng->len = id;
-	memcpy(&ng->ptr, &old_ng->ptr, old_ng->len);
+	memcpy(&ng->ptr, &old_ng->ptr, old_ng->len * sizeof(void*));
 
 	rcu_assign_pointer(net->gen, ng);
 	call_rcu(&old_ng->rcu, net_generic_release);