Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by Kenji Kaneshige and committed by Jesse Barnes c4e5fadd 77db9885
+7
-1
drivers/pci/pci-acpi.c
+7
-1
drivers/pci/pci-acpi.c
···
60
union acpi_object *out_obj;
61
u32 osc_dw0;
62
acpi_status *ret_status = (acpi_status *)retval;
63
-
struct acpi_osc_data *osc_data = acpi_get_osc_data(handle);
64
u32 flags = (unsigned long)context, temp;
65
66
if (!osc_data) {
67
printk(KERN_ERR "acpi osc data array is full\n");
68
return AE_ERROR;
···
60
union acpi_object *out_obj;
61
u32 osc_dw0;
62
acpi_status *ret_status = (acpi_status *)retval;
63
+
struct acpi_osc_data *osc_data;
64
u32 flags = (unsigned long)context, temp;
65
+
acpi_handle tmp;
66
67
+
status = acpi_get_handle(handle, "_OSC", &tmp);
68
+
if (ACPI_FAILURE(status))
69
+
return status;
70
+
71
+
osc_data = acpi_get_osc_data(handle);
72
if (!osc_data) {
73
printk(KERN_ERR "acpi osc data array is full\n");
74
return AE_ERROR;