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>

diff --git a/ipc/util.c b/ipc/util.c
index 556884bab698c9ea9fe01bfc3dbfa962a77e55e2..2428dd44ca979fd99941793946836e1e72c56998 100644 (file)
--- 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 44efbc0b635b43a6383c304dddaa605108ad20c1..77336c2bdb9c912183ef1ea087c93e7111b9d8e2 100644 (file)
--- 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));