Commit 02c03510 authored by Mattias Jacobsson's avatar Mattias Jacobsson Committed by Greg Kroah-Hartman

platform/x86: wmi: fix potential null pointer dereference

[ Upstream commit c355ec65 ]

In the function wmi_dev_match() the variable id is dereferenced without
first performing a NULL check. The variable can for example be NULL if
a WMI driver is registered without specifying the id_table field in
struct wmi_driver.

Add a NULL check and return that the driver can't handle the device if
the variable is NULL.

Fixes: 844af950 ("platform/x86: wmi: Turn WMI into a bus driver")
Signed-off-by: default avatarMattias Jacobsson <2pi@mok.nu>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 45f525b3
......@@ -768,6 +768,9 @@ static int wmi_dev_match(struct device *dev, struct device_driver *driver)
struct wmi_block *wblock = dev_to_wblock(dev);
const struct wmi_device_id *id = wmi_driver->id_table;
if (id == NULL)
return 0;
while (id->guid_string) {
uuid_le driver_guid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment