[PATCH] PCI: hotplug: fix error path in pci_slot's register_slot

[PATCH] PCI: hotplug: fix error path in pci_slot's register_slot

[Alex Chiang]

Juha Leppänen noticed that an error path in register_slot()
wasn't returning appropriately, leading to a condition where we
might access a kfree'ed pointer, so let's fix that.

Additionally, fix up the copyright information in the file while
we're in there.

Signed-off-by: Alex Chiang <achiang@hp.com>

diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
index b9ab030..dd376f7 100644
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
@@ -6,8 +6,8 @@
  *  Thanks to Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> for code
  *  review and fixes.
  *
- *  Copyright (C) 2007 Alex Chiang <achiang@hp.com>
- *  Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
+ *  Copyright (C) 2007-2008 Hewlett-Packard Development Company, L.P.
+ *  	Alex Chiang <achiang@hp.com>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms and conditions of the GNU General Public License,
@@ -158,6 +158,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
 	if (IS_ERR(pci_slot)) {
 		err("pci_create_slot returned %ld\n", PTR_ERR(pci_slot));
 		kfree(slot);
+		return AE_OK;
 	}
 
 	slot->root_handle = parent_context->root_handle;

Re: [PATCH] PCI: hotplug: fix error path in pci_slot's register_slot

[Jesse Barnes]

On Thursday, July 17, 2008 10:13 am Alex Chiang wrote:
> Juha Leppänen noticed that an error path in register_slot()
> wasn't returning appropriately, leading to a condition where we
> might access a kfree'ed pointer, so let's fix that.
>
> Additionally, fix up the copyright information in the file while
> we're in there.
>
> Signed-off-by: Alex Chiang <achiang@hp.com>

Thanks Alex & Juha, I've applied this to my for-linus tree.

Jesse