Commit e2029dfe authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

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.comSigned-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 fb259c31
...@@ -258,18 +258,13 @@ static void merge_queues(struct sem_array *sma) ...@@ -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) static void sem_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 sem_array *sma = container_of(p, struct sem_array, sem_perm); struct sem_array *sma = container_of(p, struct sem_array, sem_perm);
security_sem_free(sma); security_sem_free(sma);
__sem_free(sma); kvfree(sma);
} }
/* /*
...@@ -500,7 +495,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params) ...@@ -500,7 +495,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
sma->sem_perm.security = NULL; sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma); retval = security_sem_alloc(sma);
if (retval) { if (retval) {
__sem_free(sma); kvfree(sma);
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment