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

torvalds · torvalds · commit 2c1ada4f052d · 2019-03-22T12:07:06.000-07:00
Pull ACPI fix from Rafael Wysocki:
 "Prevent device references acquired by bus_find_device() in
  acpi_dev_present() from being leaked (Andy Shevchenko)"

* tag 'acpi-5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / utils: Drop reference in test for device presence
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
@@ -800,6 +800,7 @@ bool acpi_dev_present(const char *hid, const char *uid, s64 hrv)
 	match.hrv = hrv;
 
 	dev = bus_find_device(&acpi_bus_type, NULL, &match, acpi_dev_match_cb);
+	put_device(dev);
 	return !!dev;
 }
 EXPORT_SYMBOL(acpi_dev_present);

Original file line number	Diff line number	Diff line change
`@@ -800,6 +800,7 @@ bool acpi_dev_present(const char hid, const char uid, s64 hrv)`
`800`	`800`	`match.hrv = hrv;`
`801`	`801`
`802`	`802`	`dev = bus_find_device(&acpi_bus_type, NULL, &match, acpi_dev_match_cb);`
	`803`	`+ put_device(dev);`
`803`	`804`	`return !!dev;`
`804`	`805`	`}`
`805`	`806`	`EXPORT_SYMBOL(acpi_dev_present);`