Commit 15b94fa3 authored Sep 24, 2015 by Lv Zheng Committed by Rafael J. Wysocki Sep 26, 2015

ACPI / EC: Fix a memory leak issue in acpi_ec_query()



When query handler is not found, "result" is actually stil 0, and
"struct acpi_ec_query" is not NULL, so the deletion code of
"struct acpi_ec_query" at the end of the function cannot be invoked.
As a consequence, memory leak can be observed.

The issue is introduced by this commit:
  Commit: 02b771b6
  Subject: ACPI / EC: Fix an issue caused by the serialized _Qxx

This patch fixes such memory leakage.

Fixes: 02b771b6 (ACPI / EC: Fix an issue caused by the serialized _Qxx evaluations)
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 1f93e4a9

drivers/acpi/ec.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1044,8 +1044,10 @@ static int acpi_ec_query(struct acpi_ec ec, u8 data)
		goto err_exit;

		mutex_lock(&ec->mutex);
		result = -ENODATA;
		list_for_each_entry(handler, &ec->list, node) {
		if (value == handler->query_bit) {
		result = 0;
		q->handler = acpi_ec_get_query_handler(handler);
		ec_dbg_evt("Query(0x%02x) scheduled",
		q->handler->query_bit);

Admin message