Commit 1b1bb7b2 authored by Brian Norris's avatar Brian Norris Committed by Greg Kroah-Hartman
Browse files

drivers: base: Don't match devices with NULL of_node/fwnode/etc 



of_find_device_by_node(), bus_find_device_by_of_node(),
bus_find_device_by_fwnode(), ..., all produce arbitrary results when
provided with a NULL of_node, fwnode, ACPI handle, etc. This is
counterintuitive, and the source of a few bugs, such as the one fixed by
commit 5c8418cf ("PCI/pwrctrl: Unregister platform device only if
one actually exists").

It's hard to imagine a good reason that these device_match_*() APIs
should return 'true' for a NULL argument. Augment these to return 0
(false).

Reviewed-by: default avatarRob Herring (Arm) <robh@kernel.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Acked-by: default avatarDavid Gow <davidgow@google.com>
Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/20241216201148.535115-2-briannorris@chromium.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ab5a377

drivers/base/core.c

+4 −4
Original line number Diff line number Diff line
@@ -5246,13 +5246,13 @@ EXPORT_SYMBOL_GPL(device_match_name); 


int device_match_of_node(struct device *dev, const void *np)

{

	return dev->of_node == np;

	return np && dev->of_node == np;

}

EXPORT_SYMBOL_GPL(device_match_of_node);



int device_match_fwnode(struct device *dev, const void *fwnode)

{

	return dev_fwnode(dev) == fwnode;

	return fwnode && dev_fwnode(dev) == fwnode;

}

EXPORT_SYMBOL_GPL(device_match_fwnode);
@@ -5264,13 +5264,13 @@ EXPORT_SYMBOL_GPL(device_match_devt); 


int device_match_acpi_dev(struct device *dev, const void *adev)

{

	return ACPI_COMPANION(dev) == adev;

	return adev && ACPI_COMPANION(dev) == adev;

}

EXPORT_SYMBOL(device_match_acpi_dev);



int device_match_acpi_handle(struct device *dev, const void *handle)

{

	return ACPI_HANDLE(dev) == handle;

	return handle && ACPI_HANDLE(dev) == handle;

}

EXPORT_SYMBOL(device_match_acpi_handle);