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

2c1ada4f · Linus Torvalds <[email protected]> · 2019-03-22 12:07:06 -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

Commit: 2c1ada4f052d6d5e5c0bf7901617479b2146139e
Parents: b44290a0 · 54e3aca8

Merge commit. Changes below are compared with the first parent: b44290a0.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/acpi/utils.c	modified	+1	−0	View file

drivers/acpi/utils.c

View file

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 78db976..c4b06cc 100644
--- 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);