Skip to content

L
linux
Commit b8d261e0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

[PATCH] IBM PCI Hotplug: fix a load of memory leak errors found by the checker project.

parent 36b66b53
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 67 deletions
drivers/hotplug/ibmphp_ebda.c
View file @ b8d261e0
...@@ -70,17 +70,6 @@ static int ebda_rsrc_controller (void); ...@@ -70,17 +70,6 @@ static int ebda_rsrc_controller (void);
static int ebda_rsrc_rsrc (void); static int ebda_rsrc_rsrc (void);
static int ebda_rio_table (void); static int ebda_rio_table (void);
static struct slot *alloc_ibm_slot (void)
{
struct slot *slot;
slot = kmalloc (sizeof (struct slot), GFP_KERNEL);
if (!slot)
return NULL;
memset (slot, 0, sizeof (*slot));
return slot;
}
static struct ebda_hpc_list * __init alloc_ebda_hpc_list (void) static struct ebda_hpc_list * __init alloc_ebda_hpc_list (void)
{ {
struct ebda_hpc_list *list; struct ebda_hpc_list *list;
...@@ -757,8 +746,7 @@ static int __init ebda_rsrc_controller (void) ...@@ -757,8 +746,7 @@ static int __init ebda_rsrc_controller (void)
struct ebda_hpc_slot *slot_ptr; struct ebda_hpc_slot *slot_ptr;
struct bus_info *bus_info_ptr1, *bus_info_ptr2; struct bus_info *bus_info_ptr1, *bus_info_ptr2;
int rc; int rc;
int retval; struct slot *tmp_slot;
struct slot *slot_cur;
struct list_head *list; struct list_head *list;
addr = hpc_list_ptr->phys_addr; addr = hpc_list_ptr->phys_addr;
...@@ -783,8 +771,8 @@ static int __init ebda_rsrc_controller (void) ...@@ -783,8 +771,8 @@ static int __init ebda_rsrc_controller (void)
/* init hpc structure */ /* init hpc structure */
hpc_ptr = alloc_ebda_hpc (slot_num, bus_num); hpc_ptr = alloc_ebda_hpc (slot_num, bus_num);
if (!hpc_ptr ) { if (!hpc_ptr ) {
iounmap (io_mem); rc = -ENOMEM;
return -ENOMEM; goto error_no_hpc;
} }
hpc_ptr->ctlr_id = ctlr_id; hpc_ptr->ctlr_id = ctlr_id;
hpc_ptr->ctlr_relative_id = ctlr; hpc_ptr->ctlr_relative_id = ctlr;
...@@ -810,8 +798,8 @@ static int __init ebda_rsrc_controller (void) ...@@ -810,8 +798,8 @@ static int __init ebda_rsrc_controller (void)
if (!bus_info_ptr2) { if (!bus_info_ptr2) {
bus_info_ptr1 = (struct bus_info *) kmalloc (sizeof (struct bus_info), GFP_KERNEL); bus_info_ptr1 = (struct bus_info *) kmalloc (sizeof (struct bus_info), GFP_KERNEL);
if (!bus_info_ptr1) { if (!bus_info_ptr1) {
iounmap (io_mem); rc = -ENOMEM;
return -ENOMEM; goto error_no_hp_slot;
} }
memset (bus_info_ptr1, 0, sizeof (struct bus_info)); memset (bus_info_ptr1, 0, sizeof (struct bus_info));
bus_info_ptr1->slot_min = slot_ptr->slot_num; bus_info_ptr1->slot_min = slot_ptr->slot_num;
...@@ -871,16 +859,20 @@ static int __init ebda_rsrc_controller (void) ...@@ -871,16 +859,20 @@ static int __init ebda_rsrc_controller (void)
hpc_ptr->u.pci_ctlr.dev_fun = readb (io_mem + addr + 1); hpc_ptr->u.pci_ctlr.dev_fun = readb (io_mem + addr + 1);
hpc_ptr->irq = readb (io_mem + addr + 2); hpc_ptr->irq = readb (io_mem + addr + 2);
addr += 3; addr += 3;
debug ("ctrl bus = %x, ctlr devfun = %x, irq = %x\n", hpc_ptr->u.pci_ctlr.bus, hpc_ptr->u.pci_ctlr.dev_fun, hpc_ptr->irq); debug ("ctrl bus = %x, ctlr devfun = %x, irq = %x\n",
hpc_ptr->u.pci_ctlr.bus,
hpc_ptr->u.pci_ctlr.dev_fun, hpc_ptr->irq);
break; break;
case 0: case 0:
hpc_ptr->u.isa_ctlr.io_start = readw (io_mem + addr); hpc_ptr->u.isa_ctlr.io_start = readw (io_mem + addr);
hpc_ptr->u.isa_ctlr.io_end = readw (io_mem + addr + 2); hpc_ptr->u.isa_ctlr.io_end = readw (io_mem + addr + 2);
retval = check_region (hpc_ptr->u.isa_ctlr.io_start, (hpc_ptr->u.isa_ctlr.io_end - hpc_ptr->u.isa_ctlr.io_start + 1)); if (!request_region (hpc_ptr->u.isa_ctlr.io_start,
if (retval) (hpc_ptr->u.isa_ctlr.io_end - hpc_ptr->u.isa_ctlr.io_start + 1),
return -ENODEV; "ibmphp")) {
request_region (hpc_ptr->u.isa_ctlr.io_start, (hpc_ptr->u.isa_ctlr.io_end - hpc_ptr->u.isa_ctlr.io_start + 1), "ibmphp"); rc = -ENODEV;
goto error_no_hp_slot;
}
hpc_ptr->irq = readb (io_mem + addr + 4); hpc_ptr->irq = readb (io_mem + addr + 4);
addr += 5; addr += 5;
break; break;
...@@ -893,8 +885,8 @@ static int __init ebda_rsrc_controller (void) ...@@ -893,8 +885,8 @@ static int __init ebda_rsrc_controller (void)
addr += 6; addr += 6;
break; break;
default: default:
iounmap (io_mem); rc = -ENODEV;
return -ENODEV; goto error_no_hp_slot;
} }
//reorganize chassis' linked list //reorganize chassis' linked list
...@@ -910,79 +902,71 @@ static int __init ebda_rsrc_controller (void) ...@@ -910,79 +902,71 @@ static int __init ebda_rsrc_controller (void)
hp_slot_ptr = (struct hotplug_slot *) kmalloc (sizeof (struct hotplug_slot), GFP_KERNEL); hp_slot_ptr = (struct hotplug_slot *) kmalloc (sizeof (struct hotplug_slot), GFP_KERNEL);
if (!hp_slot_ptr) { if (!hp_slot_ptr) {
iounmap (io_mem); rc = -ENOMEM;
return -ENOMEM; goto error_no_hp_slot;
} }
memset (hp_slot_ptr, 0, sizeof (struct hotplug_slot)); memset (hp_slot_ptr, 0, sizeof (struct hotplug_slot));
hp_slot_ptr->info = (struct hotplug_slot_info *) kmalloc (sizeof (struct hotplug_slot_info), GFP_KERNEL); hp_slot_ptr->info = (struct hotplug_slot_info *) kmalloc (sizeof (struct hotplug_slot_info), GFP_KERNEL);
if (!hp_slot_ptr->info) { if (!hp_slot_ptr->info) {
iounmap (io_mem); rc = -ENOMEM;
kfree (hp_slot_ptr); goto error_no_hp_info;
return -ENOMEM;
} }
memset (hp_slot_ptr->info, 0, sizeof (struct hotplug_slot_info)); memset (hp_slot_ptr->info, 0, sizeof (struct hotplug_slot_info));
hp_slot_ptr->name = (char *) kmalloc (30, GFP_KERNEL); hp_slot_ptr->name = (char *) kmalloc (30, GFP_KERNEL);
if (!hp_slot_ptr->name) { if (!hp_slot_ptr->name) {
iounmap (io_mem); rc = -ENOMEM;
kfree (hp_slot_ptr->info); goto error_no_hp_name;
kfree (hp_slot_ptr);
return -ENOMEM;
} }
hp_slot_ptr->private = alloc_ibm_slot (); tmp_slot = kmalloc (sizeof (struct slot), GFP_KERNEL);
if (!hp_slot_ptr->private) { if (!tmp_slot) {
iounmap (io_mem); rc = -ENOMEM;
kfree (hp_slot_ptr->name); goto error_no_slot;
kfree (hp_slot_ptr->info);
kfree (hp_slot_ptr);
return -ENOMEM;
} }
memset (tmp_slot, 0, sizeof (*tmp_slot));
((struct slot *)hp_slot_ptr->private)->flag = TRUE; tmp_slot->flag = TRUE;
((struct slot *) hp_slot_ptr->private)->capabilities = hpc_ptr->slots[index].slot_cap; tmp_slot->capabilities = hpc_ptr->slots[index].slot_cap;
if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_133_MAX) == EBDA_SLOT_133_MAX) if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_133_MAX) == EBDA_SLOT_133_MAX)
((struct slot *) hp_slot_ptr->private)->supported_speed = 3; tmp_slot->supported_speed = 3;
else if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_100_MAX) == EBDA_SLOT_100_MAX) else if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_100_MAX) == EBDA_SLOT_100_MAX)
((struct slot *) hp_slot_ptr->private)->supported_speed = 2; tmp_slot->supported_speed = 2;
else if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_66_MAX) == EBDA_SLOT_66_MAX) else if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_66_MAX) == EBDA_SLOT_66_MAX)
((struct slot *) hp_slot_ptr->private)->supported_speed = 1; tmp_slot->supported_speed = 1;
if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_PCIX_CAP) == EBDA_SLOT_PCIX_CAP) if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_PCIX_CAP) == EBDA_SLOT_PCIX_CAP)
((struct slot *) hp_slot_ptr->private)->supported_bus_mode = 1; tmp_slot->supported_bus_mode = 1;
else else
((struct slot *) hp_slot_ptr->private)->supported_bus_mode = 0; tmp_slot->supported_bus_mode = 0;
((struct slot *) hp_slot_ptr->private)->bus = hpc_ptr->slots[index].slot_bus_num; tmp_slot->bus = hpc_ptr->slots[index].slot_bus_num;
bus_info_ptr1 = ibmphp_find_same_bus_num (hpc_ptr->slots[index].slot_bus_num); bus_info_ptr1 = ibmphp_find_same_bus_num (hpc_ptr->slots[index].slot_bus_num);
if (!bus_info_ptr1) { if (!bus_info_ptr1) {
iounmap (io_mem); rc = -ENODEV;
return -ENODEV; goto error;
} }
((struct slot *) hp_slot_ptr->private)->bus_on = bus_info_ptr1; tmp_slot->bus_on = bus_info_ptr1;
bus_info_ptr1 = NULL; bus_info_ptr1 = NULL;
((struct slot *) hp_slot_ptr->private)->ctrl = hpc_ptr; tmp_slot->ctrl = hpc_ptr;
tmp_slot->ctlr_index = hpc_ptr->slots[index].ctl_index;
tmp_slot->number = hpc_ptr->slots[index].slot_num;
tmp_slot->hotplug_slot = hp_slot_ptr;
((struct slot *) hp_slot_ptr->private)->ctlr_index = hpc_ptr->slots[index].ctl_index; hp_slot_ptr->private = tmp_slot;
((struct slot *) hp_slot_ptr->private)->number = hpc_ptr->slots[index].slot_num;
((struct slot *) hp_slot_ptr->private)->hotplug_slot = hp_slot_ptr;
rc = ibmphp_hpc_fillhpslotinfo (hp_slot_ptr); rc = ibmphp_hpc_fillhpslotinfo (hp_slot_ptr);
if (rc) { if (rc)
iounmap (io_mem); goto error;
return rc;
}
rc = ibmphp_init_devno ((struct slot **) &hp_slot_ptr->private); rc = ibmphp_init_devno ((struct slot **) &hp_slot_ptr->private);
if (rc) { if (rc)
iounmap (io_mem); goto error;
return rc;
}
hp_slot_ptr->ops = &ibmphp_hotplug_slot_ops; hp_slot_ptr->ops = &ibmphp_hotplug_slot_ops;
// end of registering ibm slot with hotplug core // end of registering ibm slot with hotplug core
...@@ -996,15 +980,29 @@ static int __init ebda_rsrc_controller (void) ...@@ -996,15 +980,29 @@ static int __init ebda_rsrc_controller (void)
} /* each hpc */ } /* each hpc */
list_for_each (list, &ibmphp_slot_head) { list_for_each (list, &ibmphp_slot_head) {
slot_cur = list_entry (list, struct slot, ibm_slot_list); tmp_slot = list_entry (list, struct slot, ibm_slot_list);
snprintf (slot_cur->hotplug_slot->name, 30, "%s", create_file_name (slot_cur)); snprintf (tmp_slot->hotplug_slot->name, 30, "%s", create_file_name (tmp_slot));
pci_hp_register (slot_cur->hotplug_slot); pci_hp_register (tmp_slot->hotplug_slot);
} }
print_ebda_hpc (); print_ebda_hpc ();
print_ibm_slot (); print_ibm_slot ();
return 0; return 0;
error:
kfree (hp_slot_ptr->private);
error_no_slot:
kfree (hp_slot_ptr->name);
error_no_hp_name:
kfree (hp_slot_ptr->info);
error_no_hp_info:
kfree (hp_slot_ptr);
error_no_hp_slot:
free_ebda_hpc (hpc_ptr);
error_no_hpc:
iounmap (io_mem);
return rc;
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7