Merge ../scsi-rc-fixes-2.6

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 6ebdb82a0ce4..674aceb7335a 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -44,11 +44,9 @@ static inline struct nsproxy *clone_namespaces(struct nsproxy *orig)
 {
         struct nsproxy *ns;
 
-        ns = kmalloc(sizeof(struct nsproxy), GFP_KERNEL);
-        if (ns) {
-                memcpy(ns, orig, sizeof(struct nsproxy));
+        ns = kmemdup(orig, sizeof(struct nsproxy), GFP_KERNEL);
+        if (ns)
                 atomic_set(&ns->count, 1);
-        }
         return ns;
 }