Commit c4e5fadd authored May 13, 2008 by Kenji Kaneshige Committed by Jesse Barnes May 13, 2008

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>

parent 77db9885

drivers/pci/pci-acpi.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -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;