Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev...

[pandora-kernel.git] / fs / proc / proc_net.c

diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 9020ac1..f738024 100644 (file)
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -197,15 +197,15 @@ static __net_init int proc_net_ns_init(struct net *net)
        int err;
 
        err = -ENOMEM;
-       netd = kzalloc(sizeof(*netd), GFP_KERNEL);
+       netd = kzalloc(sizeof(*netd) + 4, GFP_KERNEL);
        if (!netd)
                goto out;
 
        netd->data = net;
        netd->nlink = 2;
-       netd->name = "net";
        netd->namelen = 3;
        netd->parent = &proc_root;
+       memcpy(netd->name, "net", 4);
 
        err = -EEXIST;
        net_statd = proc_net_mkdir(net, "stat", netd);