diff options
Diffstat (limited to 'kernel/utsname.c')
-rw-r--r-- | kernel/utsname.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/utsname.c b/kernel/utsname.c index 160c8c5136bd..3ae43936bd88 100644 --- a/kernel/utsname.c +++ b/kernel/utsname.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/uts.h> | 13 | #include <linux/uts.h> |
14 | #include <linux/utsname.h> | 14 | #include <linux/utsname.h> |
15 | #include <linux/version.h> | 15 | #include <linux/version.h> |
16 | #include <linux/err.h> | ||
16 | 17 | ||
17 | /* | 18 | /* |
18 | * Clone a new ns copying an original utsname, setting refcount to 1 | 19 | * Clone a new ns copying an original utsname, setting refcount to 1 |
@@ -24,10 +25,11 @@ static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns) | |||
24 | struct uts_namespace *ns; | 25 | struct uts_namespace *ns; |
25 | 26 | ||
26 | ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL); | 27 | ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL); |
27 | if (ns) { | 28 | if (!ns) |
28 | memcpy(&ns->name, &old_ns->name, sizeof(ns->name)); | 29 | return ERR_PTR(-ENOMEM); |
29 | kref_init(&ns->kref); | 30 | |
30 | } | 31 | memcpy(&ns->name, &old_ns->name, sizeof(ns->name)); |
32 | kref_init(&ns->kref); | ||
31 | return ns; | 33 | return ns; |
32 | } | 34 | } |
33 | 35 | ||