aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/namespace.c
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/namespace.c')
-rw-r--r--ipc/namespace.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/ipc/namespace.c b/ipc/namespace.c
index cef1139e6c96..1fed8922d475 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -14,35 +14,18 @@
14 14
15static struct ipc_namespace *clone_ipc_ns(struct ipc_namespace *old_ns) 15static struct ipc_namespace *clone_ipc_ns(struct ipc_namespace *old_ns)
16{ 16{
17 int err;
18 struct ipc_namespace *ns; 17 struct ipc_namespace *ns;
19 18
20 err = -ENOMEM;
21 ns = kmalloc(sizeof(struct ipc_namespace), GFP_KERNEL); 19 ns = kmalloc(sizeof(struct ipc_namespace), GFP_KERNEL);
22 if (ns == NULL) 20 if (ns == NULL)
23 goto err_mem; 21 return ERR_PTR(-ENOMEM);
24 22
25 err = sem_init_ns(ns); 23 sem_init_ns(ns);
26 if (err) 24 msg_init_ns(ns);
27 goto err_sem; 25 shm_init_ns(ns);
28 err = msg_init_ns(ns);
29 if (err)
30 goto err_msg;
31 err = shm_init_ns(ns);
32 if (err)
33 goto err_shm;
34 26
35 kref_init(&ns->kref); 27 kref_init(&ns->kref);
36 return ns; 28 return ns;
37
38err_shm:
39 msg_exit_ns(ns);
40err_msg:
41 sem_exit_ns(ns);
42err_sem:
43 kfree(ns);
44err_mem:
45 return ERR_PTR(err);
46} 29}
47 30
48struct ipc_namespace *copy_ipcs(unsigned long flags, struct ipc_namespace *ns) 31struct ipc_namespace *copy_ipcs(unsigned long flags, struct ipc_namespace *ns)