From: Chris Wright <chrisw@osdl.org>
Date: Mon, 28 Nov 2005 22:47:41 +0000 (-0800)
Subject: Add drivers/infiniband/core/mad.c NULL ptr deref fix from Adrian Bunk
X-Git-Tag: v2.6.14.4~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f2553d1d1c7f9af13e54f70e1abef542a852c5f;p=thirdparty%2Fkernel%2Fstable-queue.git

Add drivers/infiniband/core/mad.c NULL ptr deref fix from Adrian Bunk
(found by Coverity)
---

diff --git a/queue/infiniband-fix-a-null-pointer-deref.patch b/queue/infiniband-fix-a-null-pointer-deref.patch
new file mode 100644
index 00000000000..8141a81cfae
--- /dev/null
+++ b/queue/infiniband-fix-a-null-pointer-deref.patch
@@ -0,0 +1,34 @@
+From stable-bounces@linux.kernel.org  Mon Nov 28 03:46:11 2005
+Date: Mon, 28 Nov 2005 12:46:00 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: stable@kernel.org
+Cc: 
+Subject: drivers/infiniband/core/mad.c: fix a NULL pointer dereference
+
+The Coverity checker spotted this obvious NULL pointer dereference 
+caused by a wrong order of the cleanups.
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Acked-by: Roland Dreier <rolandd@cisco.com>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+
+ drivers/infiniband/core/mad.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.14.y/drivers/infiniband/core/mad.c
+===================================================================
+--- linux-2.6.14.y.orig/drivers/infiniband/core/mad.c
++++ linux-2.6.14.y/drivers/infiniband/core/mad.c
+@@ -356,9 +356,9 @@ error4:
+ 	spin_unlock_irqrestore(&port_priv->reg_lock, flags);
+ 	kfree(reg_req);
+ error3:
+-	kfree(mad_agent_priv);
+-error2:
+ 	ib_dereg_mr(mad_agent_priv->agent.mr);
++error2:
++	kfree(mad_agent_priv);
+ error1:
+ 	return ret;
+ }
diff --git a/queue/series b/queue/series
index 8b2c3461512..9b879d818c8 100644
--- a/queue/series
+++ b/queue/series
@@ -1,2 +1,3 @@
 dpt_i2o-fix-a-null-pointer-deref.patch
 message-i2o-pci-fix-null-pointer-deref.patch
+infiniband-fix-a-null-pointer-deref.patch