]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
[PATCH] add pciehp patch that is in -bk already.
authorgregkh@suse.de <gregkh@suse.de>
Wed, 9 Mar 2005 19:50:05 +0000 (11:50 -0800)
committerGreg KH <gregkh@suse.de>
Thu, 12 May 2005 05:08:40 +0000 (22:08 -0700)
pciehp.patch [new file with mode: 0644]

diff --git a/pciehp.patch b/pciehp.patch
new file mode 100644 (file)
index 0000000..0e36087
--- /dev/null
@@ -0,0 +1,37 @@
+From owner-linux-pci@atrey.karlin.mff.cuni.cz Fri Mar  4 12:58:15 2005
+From: alexn@dsv.su.se
+Subject: [PATCH] PCI: fix hotplug double free
+Date: Fri, 4 Mar 2005 12:53:58 -0800
+To: linux-kernel@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz
+Status: RO
+Content-Length: 863
+Lines: 27
+
+[PATCH] PCI: fix hotplug double free
+
+With the brackets missed out func could be freed twice.
+
+Found by Coverity tool
+
+Signed-off-by: Alexander Nyberg <alexn@dsv.su.se>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+
+diff -Nru a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
+--- a/drivers/pci/hotplug/pciehp_ctrl.c        2005-03-04 12:41:13 -08:00
++++ b/drivers/pci/hotplug/pciehp_ctrl.c        2005-03-04 12:41:13 -08:00
+@@ -1354,10 +1354,11 @@
+                               dbg("PCI Bridge Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
+                                       ctrl->seg, func->bus, func->device, func->function);
+                               bridge_slot_remove(func);
+-                      } else
++                      } else {
+                               dbg("PCI Function Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
+                                       ctrl->seg, func->bus, func->device, func->function);
+                               slot_remove(func);
++                      }
+                       func = pciehp_slot_find(ctrl->slot_bus, device, 0);
+               }
+