Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb259c31 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarManfred Spraul <manfred@colorfullife.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42e618f7

ipc/msg.c

+4 −20
Original line number Diff line number Diff line
@@ -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;

	}