ipc: optimize semget/shmget/msgget for lots of keys

[mirror_ubuntu-bionic-kernel.git] / ipc / namespace.c

diff --git a/ipc/namespace.c b/ipc/namespace.c
index 7af6e6b883b9c21edd1782008c1c209d55151f18..fc850c526698428fad7e7538e3ba673486553358 100644 (file)
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -54,16 +54,28 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
        ns->user_ns = get_user_ns(user_ns);
        ns->ucounts = ucounts;
 
-       err = mq_init_ns(ns);
+       err = sem_init_ns(ns);
        if (err)
                goto fail_put;
+       err = msg_init_ns(ns);
+       if (err)
+               goto fail_destroy_sem;
+       err = shm_init_ns(ns);
+       if (err)
+               goto fail_destroy_msg;
 
-       sem_init_ns(ns);
-       msg_init_ns(ns);
-       shm_init_ns(ns);
+       err = mq_init_ns(ns);
+       if (err)
+               goto fail_destroy_shm;
 
        return ns;
 
+fail_destroy_shm:
+       shm_exit_ns(ns);
+fail_destroy_msg:
+       msg_exit_ns(ns);
+fail_destroy_sem:
+       sem_exit_ns(ns);
 fail_put:
        put_user_ns(ns->user_ns);
        ns_free_inum(&ns->ns);