diff options
| author | Kees Cook <keescook@chromium.org> | 2017-07-13 00:35:28 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 02:26:02 +0300 |
| commit | fb259c310f79d295c2da2934ff2282e1b7c30529 (patch) | |
| tree | 77f5e5f6aadf32314226417e43bb0c83e759f641 /ipc | |
| parent | 42e618f77dabc82c697915c193d729e9d16e2a75 (diff) | |
| download | linux-fb259c310f79d295c2da2934ff2282e1b7c30529.tar.xz | |
ipc/msg: remove special msg_alloc/free
There is nothing special about the msg_alloc/free routines any more, so
remove them to make code more readable.
[manfred@colorfullife.com: Rediff to keep rcu protection for security_msg_queue_alloc()]
Link: http://lkml.kernel.org/r/20170525185107.12869-19-manfred@colorfullife.com
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/msg.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 770342e1d327..5b25e0755656 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -95,29 +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; - - return msq; + kvfree(msq); } /** @@ -134,8 +118,8 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params) 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; @@ -144,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; } |