p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Kees Cook 2017-07-12 14:35:28 -07:00 committed by Linus Torvalds
parent 42e618f77d
commit fb259c310f
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ipc/msg.c
View File

@ -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); 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) static void msg_rcu_free(struct rcu_head *head)
{ {
struct kern_ipc_perm *p = container_of(head, struct kern_ipc_perm, rcu); 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); struct msg_queue *msq = container_of(p, struct msg_queue, q_perm);
security_msg_queue_free(msq); security_msg_queue_free(msq);
__msg_free(msq); kvfree(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;
} }
/** /**
@ -134,8 +118,8 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
key_t key = params->key; key_t key = params->key;
int msgflg = params->flg; int msgflg = params->flg;
msq = msg_alloc(); msq = kvmalloc(sizeof(*msq), GFP_KERNEL);
if (!msq) if (unlikely(!msq))
return -ENOMEM; return -ENOMEM;
msq->q_perm.mode = msgflg & S_IRWXUGO; 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; msq->q_perm.security = NULL;
retval = security_msg_queue_alloc(msq); retval = security_msg_queue_alloc(msq);
if (retval) { if (retval) {
__msg_free(msq); kvfree(msq);
return retval; return retval;
} }