summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-07-12 14:35:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-12 16:26:02 -0700
commitc3f6fb6fe4e638a58eae558cb209c463cd46c2fc (patch)
treeae8c9acb31bd1bb06be3f2b96df4af8fe567a8d7
parent52f908904e7e05b6300162faa48152df073be645 (diff)
downloadlinux-c3f6fb6fe4e638a58eae558cb209c463cd46c2fc.tar.gz
linux-c3f6fb6fe4e638a58eae558cb209c463cd46c2fc.tar.bz2
linux-c3f6fb6fe4e638a58eae558cb209c463cd46c2fc.zip
ipc/util: drop ipc_rcu_alloc()
No callers remain for ipc_rcu_alloc(). Drop the function. [manfred@colorfullife.com: Rediff because the memset was temporarily inside ipc_rcu_free()] Link: http://lkml.kernel.org/r/20170525185107.12869-13-manfred@colorfullife.com Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Manfred Spraul <manfred@colorfullife.com> Cc: Kees Cook <keescook@chromium.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--ipc/util.c21
-rw-r--r--ipc/util.h3
2 files changed, 0 insertions, 24 deletions
diff --git a/ipc/util.c b/ipc/util.c
index 556884bab698..2428dd44ca97 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -394,27 +394,6 @@ void ipc_rmid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp)
ipcp->deleted = true;
}
-/**
- * ipc_rcu_alloc - allocate ipc space
- * @size: size desired
- *
- * Allocate memory for an ipc object.
- * The first member must be struct kern_ipc_perm.
- */
-struct kern_ipc_perm *ipc_rcu_alloc(int size)
-{
- /*
- * We prepend the allocation with the rcu struct
- */
- struct kern_ipc_perm *out = kvmalloc(size, GFP_KERNEL);
- if (unlikely(!out))
- return NULL;
-
- memset(out, 0, size);
- atomic_set(&out->refcount, 1);
- return out;
-}
-
int ipc_rcu_getref(struct kern_ipc_perm *ptr)
{
return atomic_inc_not_zero(&ptr->refcount);
diff --git a/ipc/util.h b/ipc/util.h
index 44efbc0b635b..77336c2bdb9c 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -112,10 +112,7 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flg);
* Objects are reference counted, they start with reference count 1.
* getref increases the refcount, the putref call that reduces the recount
* to 0 schedules the rcu destruction. Caller must guarantee locking.
- *
- * struct kern_ipc_perm must be the first member in the allocated structure.
*/
-struct kern_ipc_perm *ipc_rcu_alloc(int size);
int ipc_rcu_getref(struct kern_ipc_perm *ptr);
void ipc_rcu_putref(struct kern_ipc_perm *ptr,
void (*func)(struct rcu_head *head));