From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 16 Oct 2013 00:04:35 +0000 (-0700)
Subject: 3.10-stable patches
X-Git-Tag: v3.10.17~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a0981dacb0d424f05583aefd35048e69c1b7678;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	ipc-drop-ipc_lock_check.patch
---

diff --git a/queue-3.10/ipc-drop-ipc_lock_check.patch b/queue-3.10/ipc-drop-ipc_lock_check.patch
new file mode 100644
index 00000000000..15414f86c7a
--- /dev/null
+++ b/queue-3.10/ipc-drop-ipc_lock_check.patch
@@ -0,0 +1,60 @@
+From 20b8875abcf2daa1dda5cf70bd6369df5e85d4c1 Mon Sep 17 00:00:00 2001
+From: Davidlohr Bueso <davidlohr.bueso@hp.com>
+Date: Wed, 11 Sep 2013 14:26:31 -0700
+Subject: ipc: drop ipc_lock_check
+
+From: Davidlohr Bueso <davidlohr.bueso@hp.com>
+
+commit 20b8875abcf2daa1dda5cf70bd6369df5e85d4c1 upstream.
+
+No remaining users, we now use ipc_obtain_object_check().
+
+Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
+Cc: Sedat Dilek <sedat.dilek@gmail.com>
+Cc: Rik van Riel <riel@redhat.com>
+Cc: Manfred Spraul <manfred@colorfullife.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Mike Galbraith <efault@gmx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ ipc/util.c |   16 ----------------
+ ipc/util.h |    1 -
+ 2 files changed, 17 deletions(-)
+
+--- a/ipc/util.c
++++ b/ipc/util.c
+@@ -686,22 +686,6 @@ out:
+ 	return out;
+ }
+ 
+-struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id)
+-{
+-	struct kern_ipc_perm *out;
+-
+-	out = ipc_lock(ids, id);
+-	if (IS_ERR(out))
+-		return out;
+-
+-	if (ipc_checkid(out, id)) {
+-		ipc_unlock(out);
+-		return ERR_PTR(-EIDRM);
+-	}
+-
+-	return out;
+-}
+-
+ /**
+  * ipcget - Common sys_*get() code
+  * @ns : namsepace
+--- a/ipc/util.h
++++ b/ipc/util.h
+@@ -177,7 +177,6 @@ static inline void ipc_unlock(struct ker
+ 	rcu_read_unlock();
+ }
+ 
+-struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id);
+ struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id);
+ int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids,
+ 			struct ipc_ops *ops, struct ipc_params *params);
diff --git a/queue-3.10/series b/queue-3.10/series
index 3ac2d82bcb6..7b814dd4bb7 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -59,3 +59,4 @@ ipc-document-general-ipc-locking-scheme.patch
 ipc-shm-guard-against-non-existant-vma-in-shmdt-2.patch
 ipc-drop-ipc_lock_by_ptr.patch
 ipc-shm-drop-shm_lock_check.patch
+ipc-drop-ipc_lock_check.patch