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

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

ipc/msg: do not use ipc_rcu_free() 

Avoid using ipc_rcu_free, since it just re-finds the original structure
pointer.  For the pre-list-init failure path, there is no RCU needed,
since it was just allocated.  It can be directly freed.

Link: http://lkml.kernel.org/r/20170525185107.12869-8-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 66470b18

ipc/msg.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -95,13 +95,18 @@ 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);

	ipc_rcu_free(head);

	__msg_free(msq);

}

}





/**

/**
@@ -131,7 +136,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) {

		ipc_rcu_putref(&msq->q_perm, ipc_rcu_free);

		__msg_free(msq);

		return retval;

		return retval;

	}

	}