From: Lv Zheng <lv.zheng@intel.com> To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Len Brown <len.brown@intel.com> Cc: Lv Zheng <lv.zheng@intel.com>, Lv Zheng <zetalog@gmail.com>, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Peter Wu <peter@lekensteyn.nl> Subject: [PATCH v2 2/4] ACPI / EC: Fix a memory leakage issue in acpi_ec_add() Date: Wed, 7 Sep 2016 16:50:14 +0800 [thread overview] Message-ID: <2a0e9a11d5e16d4775a45773c94067a8d3ea98c1.1473238007.git.lv.zheng@intel.com> (raw) In-Reply-To: <cover.1473238007.git.lv.zheng@intel.com> 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> Cc: Peter Wu <peter@lekensteyn.nl> --- drivers/acpi/ec.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 9eab651..50895ff 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; } -- 1.7.10
WARNING: multiple messages have this Message-ID (diff)
From: Lv Zheng <lv.zheng@intel.com> To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>, Len Brown <len.brown@intel.com> Cc: Lv Zheng <lv.zheng@intel.com>, Lv Zheng <zetalog@gmail.com>, <linux-kernel@vger.kernel.org>, linux-acpi@vger.kernel.org, Peter Wu <peter@lekensteyn.nl> Subject: [PATCH v2 2/4] ACPI / EC: Fix a memory leakage issue in acpi_ec_add() Date: Wed, 7 Sep 2016 16:50:14 +0800 [thread overview] Message-ID: <2a0e9a11d5e16d4775a45773c94067a8d3ea98c1.1473238007.git.lv.zheng@intel.com> (raw) In-Reply-To: <cover.1473238007.git.lv.zheng@intel.com> 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> Cc: Peter Wu <peter@lekensteyn.nl> --- drivers/acpi/ec.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 9eab651..50895ff 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; } -- 1.7.10
next prev parent reply other threads:[~2016-09-07 8:50 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-09-02 7:46 [PATCH 0/4] ACPI / EC: Fix ECDT and boot_ec support Lv Zheng 2016-09-02 7:46 ` [PATCH 1/4] ACPI / EC: Cleanup first_ec/boot_ec code Lv Zheng 2016-09-03 16:21 ` Peter Wu 2016-09-05 5:57 ` Zheng, Lv 2016-09-06 9:35 ` Peter Wu 2016-09-07 2:34 ` Zheng, Lv 2016-09-02 7:46 ` [PATCH 2/4] ACPI / EC: Fix a memory leakage issue in acpi_ec_add() Lv Zheng 2016-09-03 16:28 ` Peter Wu 2016-09-02 7:46 ` [PATCH 3/4] ACPI / EC: Fix a gap that ECDT EC cannot handle EC events Lv Zheng 2016-09-03 16:48 ` Peter Wu 2016-09-05 7:48 ` Zheng, Lv 2016-09-02 7:46 ` [PATCH 4/4] ACPI / EC: Fix issues related to boot_ec Lv Zheng 2016-09-07 8:49 ` [PATCH v2 0/4] ACPI / EC: Fix ECDT and boot_ec support Lv Zheng 2016-09-07 8:49 ` Lv Zheng 2016-09-07 8:50 ` [PATCH v2 1/4] ACPI / EC: Cleanup first_ec/boot_ec code Lv Zheng 2016-09-07 8:50 ` Lv Zheng 2016-09-07 8:50 ` Lv Zheng [this message] 2016-09-07 8:50 ` [PATCH v2 2/4] ACPI / EC: Fix a memory leakage issue in acpi_ec_add() Lv Zheng 2016-09-07 8:50 ` [PATCH v2 3/4] ACPI / EC: Fix a gap that ECDT EC cannot handle EC events Lv Zheng 2016-09-07 8:50 ` Lv Zheng 2016-09-07 8:50 ` [PATCH v2 4/4] ACPI / EC: Fix issues related to boot_ec Lv Zheng 2016-09-07 8:50 ` Lv Zheng 2016-09-12 21:55 ` [PATCH v2 0/4] ACPI / EC: Fix ECDT and boot_ec support Rafael J. Wysocki
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2a0e9a11d5e16d4775a45773c94067a8d3ea98c1.1473238007.git.lv.zheng@intel.com \ --to=lv.zheng@intel.com \ --cc=len.brown@intel.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=peter@lekensteyn.nl \ --cc=rafael.j.wysocki@intel.com \ --cc=rjw@rjwysocki.net \ --cc=zetalog@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.