Commit 66904863 authored by Axel Lin's avatar Axel Lin Committed by Matthew Garrett

acer-wmi: fix memory leaks in WMID_set_capabilities and get_wmid_devices

When acpi_evaluate_object() is passed ACPI_ALLOCATE_BUFFER, the caller
must kfree the returned buffer if AE_OK is returned.

The callers of wmi_query_block() pass ACPI_ALLOCATE_BUFFER, and thus must
check its return value before accessing or kfree() on the buffer.

This patch adds a missing kfree(out.pointer) before exit
WMID_set_capabilities() and get_wmid_devices().
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarCarlos Corbacho <carlos@strangeworlds.co.uk>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent f8ef3aec
...@@ -772,6 +772,7 @@ static acpi_status WMID_set_capabilities(void) ...@@ -772,6 +772,7 @@ static acpi_status WMID_set_capabilities(void)
obj->buffer.length == sizeof(u32)) { obj->buffer.length == sizeof(u32)) {
devices = *((u32 *) obj->buffer.pointer); devices = *((u32 *) obj->buffer.pointer);
} else { } else {
kfree(out.pointer);
return AE_ERROR; return AE_ERROR;
} }
...@@ -788,6 +789,7 @@ static acpi_status WMID_set_capabilities(void) ...@@ -788,6 +789,7 @@ static acpi_status WMID_set_capabilities(void)
if (!(devices & 0x20)) if (!(devices & 0x20))
max_brightness = 0x9; max_brightness = 0x9;
kfree(out.pointer);
return status; return status;
} }
...@@ -1094,6 +1096,7 @@ static u32 get_wmid_devices(void) ...@@ -1094,6 +1096,7 @@ static u32 get_wmid_devices(void)
struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL}; struct acpi_buffer out = {ACPI_ALLOCATE_BUFFER, NULL};
union acpi_object *obj; union acpi_object *obj;
acpi_status status; acpi_status status;
u32 devices = 0;
status = wmi_query_block(WMID_GUID2, 1, &out); status = wmi_query_block(WMID_GUID2, 1, &out);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
...@@ -1102,10 +1105,11 @@ static u32 get_wmid_devices(void) ...@@ -1102,10 +1105,11 @@ static u32 get_wmid_devices(void)
obj = (union acpi_object *) out.pointer; obj = (union acpi_object *) out.pointer;
if (obj && obj->type == ACPI_TYPE_BUFFER && if (obj && obj->type == ACPI_TYPE_BUFFER &&
obj->buffer.length == sizeof(u32)) { obj->buffer.length == sizeof(u32)) {
return *((u32 *) obj->buffer.pointer); devices = *((u32 *) obj->buffer.pointer);
} else {
return 0;
} }
kfree(out.pointer);
return devices;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment