Merge tag 'gvt-fixes-2017-07-26' of https://github.com/01org/gvt-linux into drm-intel...

[karo-tx-linux.git] / ipc / msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index 10094a731b8eed773cdbac20e94bd05f3b3cb072..5b25e0755656a6a2b85a7f647bf77cd87db77a5a 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -95,31 +95,13 @@ static inline void msg_rmid(struct ipc_namespace *ns, struct msg_queue *s)
        ipc_rmid(&msg_ids(ns), &s->q_perm);
 }
 
-static void __msg_free(struct msg_queue *msq)
-{
-       kvfree(msq);
-}
-
 static void msg_rcu_free(struct rcu_head *head)
 {
        struct kern_ipc_perm *p = container_of(head, struct kern_ipc_perm, rcu);
        struct msg_queue *msq = container_of(p, struct msg_queue, q_perm);
 
        security_msg_queue_free(msq);
-       __msg_free(msq);
-}
-
-static struct msg_queue *msg_alloc(void)
-{
-       struct msg_queue *msq;
-
-       msq = kvmalloc(sizeof(*msq), GFP_KERNEL);
-       if (unlikely(!msq))
-               return NULL;
-
-       atomic_set(&msq->q_perm.refcount, 1);
-
-       return msq;
+       kvfree(msq);
 }
 
 /**
@@ -132,12 +114,12 @@ static struct msg_queue *msg_alloc(void)
 static int newque(struct ipc_namespace *ns, struct ipc_params *params)
 {
        struct msg_queue *msq;
-       int id, retval;
+       int retval;
        key_t key = params->key;
        int msgflg = params->flg;
 
-       msq = msg_alloc();
-       if (!msq)
+       msq = kvmalloc(sizeof(*msq), GFP_KERNEL);
+       if (unlikely(!msq))
                return -ENOMEM;
 
        msq->q_perm.mode = msgflg & S_IRWXUGO;
@@ -146,7 +128,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
        msq->q_perm.security = NULL;
        retval = security_msg_queue_alloc(msq);
        if (retval) {
-               __msg_free(msq);
+               kvfree(msq);
                return retval;
        }
 
@@ -160,10 +142,10 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
        INIT_LIST_HEAD(&msq->q_senders);
 
        /* ipc_addid() locks msq upon success. */
-       id = ipc_addid(&msg_ids(ns), &msq->q_perm, ns->msg_ctlmni);
-       if (id < 0) {
-               ipc_rcu_putref(&msq->q_perm, msg_rcu_free);
-               return id;
+       retval = ipc_addid(&msg_ids(ns), &msq->q_perm, ns->msg_ctlmni);
+       if (retval < 0) {
+               call_rcu(&msq->q_perm.rcu, msg_rcu_free);
+               return retval;
        }
 
        ipc_unlock_object(&msq->q_perm);