aboutsummaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-07-12 14:35:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-12 16:26:02 -0700
commite2029dfeef7b09f08ac8572e8be3d4c624d1f79a (patch)
tree333397b02dc1a928dca842de2c6484a322a368f1 /ipc
parentfb259c310f79d295c2da2934ff2282e1b7c30529 (diff)
download96b-common-e2029dfeef7b09f08ac8572e8be3d4c624d1f79a.tar.gz
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>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/sem.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index 5f137738819d..9e70cd7a17da 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -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;
}