dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ACPI/PCI: another multiple _OSC memory leak fix 

The acpi_query_osc() function can be called for the ACPI object that
doesn't have _OSC method. In this case, acpi_get_osc_data() would
allocate a useless memory region. To avoid this, we need to check the
existence of _OSC before calling acpi_get_osc_data() in acpi_query_osc().

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Kenji Kaneshige 2008-05-13 16:48:50 +09:00 committed by Jesse Barnes
parent 77db988564
commit c4e5fadd2a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/pci-acpi.c
View File

@ -60,9 +60,15 @@ acpi_query_osc (
union acpi_object *out_obj;
u32 osc_dw0;
acpi_status *ret_status = (acpi_status *)retval;
struct acpi_osc_data *osc_data = acpi_get_osc_data(handle);
struct acpi_osc_data *osc_data;
u32 flags = (unsigned long)context, temp;
acpi_handle tmp;
status = acpi_get_handle(handle, "_OSC", &tmp);
if (ACPI_FAILURE(status))
return status;
osc_data = acpi_get_osc_data(handle);
if (!osc_data) {
printk(KERN_ERR "acpi osc data array is full\n");
return AE_ERROR;