ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
authorCatalin Marinas <catalin.marinas@arm.com>
Wed, 15 May 2013 16:49:35 +0000 (16:49 +0000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 15 May 2013 19:42:24 +0000 (21:42 +0200)
commit7a26b53070f0099dfcfc9d499458de861c5c4859
tree89bd2af1edb86fb2ad99662460ec42f98cbaa26f
parent0ab5bb64937d76c660c29813d8de0f4b47bf7550
ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path

Following commit 6b772e8f9 (ACPI: Update PNPID match handling for
notify), the acpi_scan_init_hotplug() calls acpi_set_pnp_ids() which
allocates acpi_hardware_id and copies a few strings (kstrdup). If the
devices does not have hardware_id set, the function exits without
freeing the previously allocated ids (and kmemleak complains). This
patch calls simply changes 'return' on error to a 'goto out' which
calls acpi_free_pnp_ids().

Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
Tested-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/scan.c