Commit e2029dfe authored Jul 12, 2017 by Kees Cook Committed by Linus Torvalds Jul 12, 2017

ipc/sem: drop __sem_free()

The remaining users of __sem_free() can simply call kvfree() instead for
better readability.

[manfred@colorfullife.com: Rediff to keep rcu protection for security_sem_alloc()]
Link: http://lkml.kernel.org/r/20170525185107.12869-20-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>

parent fb259c31

ipc/sem.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -258,18 +258,13 @@ static void merge_queues(struct sem_array *sma)
		}
		}

		static void __sem_free(struct sem_array *sma)
		{
		kvfree(sma);
		}

		static void sem_rcu_free(struct rcu_head *head)
		{
		struct kern_ipc_perm *p = container_of(head, struct kern_ipc_perm, rcu);
		struct sem_array *sma = container_of(p, struct sem_array, sem_perm);

		security_sem_free(sma);
		__sem_free(sma);
		kvfree(sma);
		}

		/*
		@@ -500,7 +495,7 @@ static int newary(struct ipc_namespace ns, struct ipc_params params)
		sma->sem_perm.security = NULL;
		retval = security_sem_alloc(sma);
		if (retval) {
		__sem_free(sma);
		kvfree(sma);
		return retval;
		}