Merge tag 'acpi-fix-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit 190b10367b0d · 2017-11-17T14:51:24.000-08:00
Pull ACPI fix from Rafael Wysocki:
 "This fixes a possible memory leak in an error code path in one of the
  utility routines (Xiongfeng Wang)"

* tag 'acpi-fix-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / utils: Fix memory leak in acpi_evaluate_reference() error path
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
@@ -355,6 +355,7 @@ acpi_evaluate_reference(acpi_handle handle,
 	}
 
 	if (package->package.count > ACPI_MAX_HANDLES) {
+		kfree(package);
 		return AE_NO_MEMORY;
 	}
 	list->count = package->package.count;

Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,7 @@ acpi_evaluate_reference(acpi_handle handle,`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`if (package->package.count > ACPI_MAX_HANDLES) {`
	`358`	`+ kfree(package);`
`358`	`359`	`return AE_NO_MEMORY;`
`359`	`360`	`}`
`360`	`361`	`list->count = package->package.count;`