diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2016-09-07 10:50:14 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-10 02:33:49 +0200 |
| commit | 46922d2a3aff5122253d97e64500801c08f4f2c0 (patch) | |
| tree | 4417cc9c60cd932e592a9940a6c0cbb7dca4eac9 /drivers/acpi/ec.c | |
| parent | ACPI / EC: Cleanup first_ec/boot_ec code (diff) | |
| download | linux-46922d2a3aff5122253d97e64500801c08f4f2c0.tar.xz linux-46922d2a3aff5122253d97e64500801c08f4f2c0.zip | |
ACPI / EC: Fix a memory leakage issue in acpi_ec_add()
When the handler installation failed, there was no code to free the
allocated EC device. This patch fixes this memory leakage issue.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=115021
Reported-and-tested-by: Luya Tshimbalanga <luya@fedoraproject.org>
Tested-by: Jonh Henderson <jw.hendy@gmail.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 9eab651a4502..50895fff6964 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1513,14 +1513,18 @@ static int acpi_ec_add(struct acpi_device *device) return -ENOMEM; if (ec_parse_device(device->handle, 0, ec, NULL) != AE_CTRL_TERMINATE) { - acpi_ec_free(ec); - return -EINVAL; + ret = -EINVAL; + goto err_alloc; } /* Find and register all query methods */ acpi_walk_namespace(ACPI_TYPE_METHOD, ec->handle, 1, acpi_ec_register_query_methods, NULL, ec, NULL); + ret = acpi_config_boot_ec(ec, false); + if (ret) + goto err_query; + device->driver_data = ec; ret = !!request_region(ec->data_addr, 1, "EC data"); @@ -1528,13 +1532,17 @@ static int acpi_ec_add(struct acpi_device *device) ret = !!request_region(ec->command_addr, 1, "EC cmd"); WARN(!ret, "Could not request EC cmd io port 0x%lx", ec->command_addr); - ret = acpi_config_boot_ec(ec, false); - /* Reprobe devices depending on the EC */ acpi_walk_dep_device_list(ec->handle); /* EC is fully operational, allow queries */ acpi_ec_enable_event(ec); + return 0; + +err_query: + acpi_ec_remove_query_handlers(ec, true, 0); +err_alloc: + acpi_ec_free(ec); return ret; } |