From 227158211e8eba104a477c9a263797256811f206 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Wed, 19 Dec 2012 05:37:47 +0000 Subject: [PATCH] ACPICA: Fix possible memory leak. Ensure cleanup after a memory allocation failure in dsmethod.c. Original Linux change from Jesper Juhl. Signed-off-by: Jesper Juhl Signed-off-by: Bob Moore Signed-off-by: Lv Zheng Signed-off-by: Rafael J. Wysocki --- drivers/acpi/acpica/dsmethod.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index 735c05996ec6..54c968ab8144 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -378,7 +378,8 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, */ info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info)); if (!info) { - return_ACPI_STATUS(AE_NO_MEMORY); + status = AE_NO_MEMORY; + goto cleanup; } info->parameters = &this_walk_state->operands[0]; -- 2.34.1