diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-30 23:50:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-15 01:33:11 +0200 |
| commit | a30c4c5ee85680bb66ed8a6c0b0bf4921125c378 (patch) | |
| tree | 42b772b0ac0c0e5100bd34da0d5fea2a3854232f | |
| parent | f716fc2ac037c45a6c641eb9f20ec602e8d04e14 (diff) | |
| download | linux-a30c4c5ee85680bb66ed8a6c0b0bf4921125c378.tar.gz linux-a30c4c5ee85680bb66ed8a6c0b0bf4921125c378.tar.bz2 linux-a30c4c5ee85680bb66ed8a6c0b0bf4921125c378.zip | |
ACPI / dock: Do not leak memory on falilures to add a dock station
The function creating and registering dock station objects,
dock_add(), leaks memory if there's an error after it's walked
the ACPI namespace calling find_dock_devices(), because it doesn't
free the list of dependent devices it's just created in those cases.
Fix that issue by adding the missing code to free the list of
dependent devices on errors.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/dock.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index a326c7993f4f..3e20b13fa272 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c @@ -115,6 +115,16 @@ add_dock_dependent_device(struct dock_station *ds, acpi_handle handle) return 0; } +static void remove_dock_dependent_devices(struct dock_station *ds) +{ + struct dock_dependent_device *dd, *aux; + + list_for_each_entry_safe(dd, aux, &ds->dependent_devices, list) { + list_del(&dd->list); + kfree(dd); + } +} + /** * dock_init_hotplug - Initialize a hotplug device on a docking station. * @dd: Dock-dependent device. @@ -895,6 +905,7 @@ static int __init dock_add(acpi_handle handle) return 0; err_rmgroup: + remove_dock_dependent_devices(dock_station); sysfs_remove_group(&dd->dev.kobj, &dock_attribute_group); err_unregister: platform_device_unregister(dd); |