lkml.org 
[lkml]   [2017]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 18/20] ipc/msg: Remove special msg_alloc/free
Date
From: Kees Cook <keescook@chromium.org>

There is nothing special about the msg_alloc/free routines any more,
so remove them to make code more readable.

Signed-off-by: Kees Cook <keescook@chromium.org>

[manfred@colorfullife.com: Rediff to keep rcu protection for
security_msg_queue_alloc()]
Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
---
ipc/msg.c | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/ipc/msg.c b/ipc/msg.c
index 770342e..5b25e07 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;
}

--
2.9.3
\
 
 \ /
  Last update: 2017-05-25 20:52    [W:0.469 / U:0.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site