Commit 38f54217 authored Jul 24, 2021 by Linus Torvalds Committed by Greg Kroah-Hartman Aug 08, 2021

ACPI: fix NULL pointer dereference

[ Upstream commit fc68f42aa737dc15e7665a4101d4168aadb8e4c4 ]

Commit 71f642833284 ("ACPI: utils: Fix reference counting in
for_each_acpi_dev_match()") started doing "acpi_dev_put()" on a pointer
that was possibly NULL.  That fails miserably, because that helper
inline function is not set up to handle that case.

Just make acpi_dev_put() silently accept a NULL pointer, rather than
calling down to put_device() with an invalid offset off that NULL
pointer.

Link: https://lore.kernel.org/lkml/a607c149-6bf6-0fd0-0e31-100378504da2@kernel.dk/


Reported-and-tested-by: Jens Axboe <axboe@kernel.dk>
Tested-by: Daniel Scally <djrscally@gmail.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 0ea2f55b

include/acpi/acpi_bus.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -681,6 +681,7 @@ acpi_dev_get_first_match_dev(const char hid, const char uid, s64 hrv);

		static inline void acpi_dev_put(struct acpi_device *adev)
		{
		if (adev)
		put_device(&adev->dev);
		}
		#else /* CONFIG_ACPI */