Merge tag 'acpi-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit c3e2f9bda2ff · 2023-12-08T11:54:07.000-08:00
Pull ACPI fix from Rafael Wysocki:
 "Fix a possible crash on an attempt to free unallocated memory in the
  error path of acpi_evaluate_reference() that has been introduced by
  one of the recent changes (Rafael Wysocki)"

* tag 'acpi-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: utils: Fix error path in acpi_evaluate_reference()
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
@@ -399,13 +399,13 @@ acpi_evaluate_reference(acpi_handle handle,
 		acpi_handle_debug(list->handles[i], "Found in reference list\n");
 	}
 
-end:
 	if (ACPI_FAILURE(status)) {
 		list->count = 0;
 		kfree(list->handles);
 		list->handles = NULL;
 	}
 
+end:
 	kfree(buffer.pointer);
 
 	return status;

Original file line number	Diff line number	Diff line change
`@@ -399,13 +399,13 @@ acpi_evaluate_reference(acpi_handle handle,`
`399`	`399`	`acpi_handle_debug(list->handles[i], "Found in reference list\n");`
`400`	`400`	`}`
`401`	`401`
`402`		`-end:`
`403`	`402`	`if (ACPI_FAILURE(status)) {`
`404`	`403`	`list->count = 0;`
`405`	`404`	`kfree(list->handles);`
`406`	`405`	`list->handles = NULL;`
`407`	`406`	`}`
`408`	`407`
	`408`	`+end:`
`409`	`409`	`kfree(buffer.pointer);`
`410`	`410`
`411`	`411`	`return status;`