From: Chris Wright <chrisw@osdl.org>
Date: Mon, 28 Nov 2005 22:44:25 +0000 (-0800)
Subject: Add NULL ptr deref fix for drivers/message/i2o/pci.c from Adrian Bunk
X-Git-Tag: v2.6.14.4~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c432652d16a181cdaca53515e9fac6c025d84b5;p=thirdparty%2Fkernel%2Fstable-queue.git

Add NULL ptr deref fix for drivers/message/i2o/pci.c from Adrian Bunk
(found by Covertiy).
---

diff --git a/queue/message-i2o-pci-fix-null-pointer-deref.patch b/queue/message-i2o-pci-fix-null-pointer-deref.patch
new file mode 100644
index 00000000000..00ddb5de85a
--- /dev/null
+++ b/queue/message-i2o-pci-fix-null-pointer-deref.patch
@@ -0,0 +1,31 @@
+From stable-bounces@linux.kernel.org  Mon Nov 28 03:44:57 2005
+Date: Mon, 28 Nov 2005 12:44:47 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: stable@kernel.org
+Cc: 
+Subject: drivers/message/i2o/pci.c: fix a NULL pointer dereference
+
+The Coverity checker spotted this obvious NULL pointer dereference.
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+
+ drivers/message/i2o/pci.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.14.y/drivers/message/i2o/pci.c
+===================================================================
+--- linux-2.6.14.y.orig/drivers/message/i2o/pci.c
++++ linux-2.6.14.y/drivers/message/i2o/pci.c
+@@ -421,8 +421,8 @@ static int __devinit i2o_pci_probe(struc
+ 	i2o_pci_free(c);
+ 
+       free_controller:
+-	i2o_iop_free(c);
+ 	put_device(c->device.parent);
++	i2o_iop_free(c);
+ 
+       disable:
+ 	pci_disable_device(pdev);
diff --git a/queue/series b/queue/series
index c09e81b6592..8b2c3461512 100644
--- a/queue/series
+++ b/queue/series
@@ -1 +1,2 @@
 dpt_i2o-fix-a-null-pointer-deref.patch
+message-i2o-pci-fix-null-pointer-deref.patch