Skip to contentSkip to conversation

PCI: hotplug: fix error path in pci_slot's register_slot

PATCH In review Alex Chiang 2 participants 2 messages Jul 17, 2008 – Jul 22, 2008

Subsystems (2)
ACPI PCI
lore
Share & tools
lore

Alex Chiang

author
#0 lore raw

PATCH 1/1 PCI: hotplug: fix error path in pci_slot's register_slot

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 <[email protected]>
drivers/acpi/pci_slot.c +3 -2
index b9ab030..dd376f7 100644
@@ -6,8 +6,8 @@
  *  Thanks to Kenji Kaneshige <[email protected]> for code
  *  review and fixes.
  *
- *  Copyright (C) 2007 Alex Chiang <[email protected]>
- *  Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
+ *  Copyright (C) 2007-2008 Hewlett-Packard Development Company, L.P.
+ *  	Alex Chiang <[email protected]>
  *
  *  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;
#1 lore raw
Quoted 8 lines · 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 <[email protected]>

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

Jesse