2002-01-16 21:04:49

by Greg KH

Subject: [PATCH] Compaq PCI Hotplug driver bugfix

Hi,

Here's a patch against 2.4.18-pre4 for the Compaq PCI Hotplug driver
that fixes two memory leaks in the driver (one if registering a slot
fails, and the other when the driver is unloaded from the kernel.)

thanks,

greg k-h


diff -Nru a/drivers/hotplug/cpqphp_core.c b/drivers/hotplug/cpqphp_core.c
--- a/drivers/hotplug/cpqphp_core.c Wed Jan 16 12:10:57 2002
+++ b/drivers/hotplug/cpqphp_core.c Wed Jan 16 12:10:57 2002
@@ -404,6 +404,10 @@
result = pci_hp_register (new_slot->hotplug_slot);
if (result) {
err ("pci_hp_register failed with error %d\n", result);
+ kfree (new_slot->hotplug_slot->info);
+ kfree (new_slot->hotplug_slot->name);
+ kfree (new_slot->hotplug_slot);
+ kfree (new_slot);
return result;
}

@@ -429,6 +433,8 @@
while (old_slot) {
next_slot = old_slot->next;
pci_hp_deregister (old_slot->hotplug_slot);
+ kfree(old_slot->hotplug_slot->info);
+ kfree(old_slot->hotplug_slot->name);
kfree(old_slot->hotplug_slot);
kfree(old_slot);
old_slot = next_slot;

2002-01-16 21:13:32

by Marcelo Tosatti

Subject: Re: [PATCH] Compaq PCI Hotplug driver bugfix

Applied.

On Wed, 16 Jan 2002, Greg KH wrote:

> Hi,
>
> Here's a patch against 2.4.18-pre4 for the Compaq PCI Hotplug driver
> that fixes two memory leaks in the driver (one if registering a slot
> fails, and the other when the driver is unloaded from the kernel.)