Commit f97e058c authored by Mario Limonciello's avatar Mario Limonciello Committed by Darren Hart (VMware)
Browse files

platform/x86: wmi: Don't allow drivers to get each other's GUIDs 



The only driver using this was dell-wmi, and it really was a hack.
The driver was getting a data attribute from another driver and this
type of action should not be encouraged.

Rather drivers that need to interact with one another should pass
data back and forth via exported functions.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@dell.com>
Reviewed-by: default avatarEdward O'Callaghan <quasisec@google.com>
Reviewed-by: default avatarPali Rohár <pali.rohar@gmail.com>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 92b8c540

drivers/platform/x86/wmi.c

+0 −17
Original line number Diff line number Diff line
@@ -368,23 +368,6 @@ union acpi_object *wmidev_block_query(struct wmi_device *wdev, u8 instance) 
}

EXPORT_SYMBOL_GPL(wmidev_block_query);



struct wmi_device *wmidev_get_other_guid(struct wmi_device *wdev,

					 const char *guid_string)

{

	struct wmi_block *this_wb = container_of(wdev, struct wmi_block, dev);

	struct wmi_block *other_wb;



	if (!find_guid(guid_string, &other_wb))

		return NULL;



	if (other_wb->acpi_device != this_wb->acpi_device)

		return NULL;



	get_device(&other_wb->dev.dev);

	return &other_wb->dev;

}

EXPORT_SYMBOL_GPL(wmidev_get_other_guid);



/**

 * wmi_set_block - Write to a WMI block

 * @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba

include/linux/wmi.h

+0 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ extern acpi_status wmidev_evaluate_method(struct wmi_device *wdev, 
extern union acpi_object *wmidev_block_query(struct wmi_device *wdev,

					     u8 instance);



/* Gets another device on the same bus.  Caller must put_device the result. */

extern struct wmi_device *wmidev_get_other_guid(struct wmi_device *wdev,

						const char *guid_string);



struct wmi_device_id {

	const char *guid_string;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE