From 5ccc8fb54f1c083f1dc7e073150ec18d43457872 Mon Sep 17 00:00:00 2001

From: Kees Cook <keescook@chromium.org>

Date: Wed, 12 Jul 2017 14:34:59 -0700

Subject: [PATCH 08/20] ipc/util: drop ipc_rcu_free()

Git-commit: 5ccc8fb54f1c083f1dc7e073150ec18d43457872

Patch-mainline: v4.13-rc1

References: bsc#1050323

There are no more callers of ipc_rcu_free(), so remove it.

Link: http://lkml.kernel.org/r/20170525185107.12869-9-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>

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>

---

 ipc/util.c | 7 -------

 ipc/util.h | 1 -

 2 files changed, 8 deletions(-)

diff --git a/ipc/util.c b/ipc/util.c

index dd73feb1569a..556884bab698 100644

--- a/ipc/util.c

+++ b/ipc/util.c

@@ -429,13 +429,6 @@ void ipc_rcu_putref(struct kern_ipc_perm *ptr,

 	call_rcu(&ptr->rcu, func);

 }

-void ipc_rcu_free(struct rcu_head *h)

-{

-	struct kern_ipc_perm *ptr = container_of(h, struct kern_ipc_perm, rcu);

-

-	kvfree(ptr);

-}

-

 /**

  * ipcperms - check ipc permissions

  * @ns: ipc namespace

diff --git a/ipc/util.h b/ipc/util.h

index 2578fd9be835..44efbc0b635b 100644

--- a/ipc/util.h

+++ b/ipc/util.h

@@ -119,7 +119,6 @@ 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));

-void ipc_rcu_free(struct rcu_head *h);

 struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int);

 struct kern_ipc_perm *ipc_obtain_object_idr(struct ipc_ids *ids, int id);

-- 

2.12.0