hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HID: rmi: Check that a device is a RMI device before calling RMI functions 

The hid-rmi driver may handle non rmi devices on composite USB devices.
Callbacks need to make sure that the current device is a RMI device before
calling RMI specific functions. Most callbacks already have this check, but
this patch adds checks to the remaining callbacks.

Reported-by: Hendrik Langer <hendrik.langer@gmx.de>
Tested-by: Hendrik Langer <hendrik.langer@gmx.de>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Andrew Duggan 2017-10-17 18:37:36 -07:00 committed by Jiri Kosina
parent 1fc26792b6
commit ef14a4bf09
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/hid/hid-rmi.c
View File

@ -368,6 +368,11 @@ static int rmi_check_sanity(struct hid_device *hdev, u8 *data, int size)
static int rmi_raw_event(struct hid_device *hdev, static int rmi_raw_event(struct hid_device *hdev,
struct hid_report *report, u8 *data, int size) struct hid_report *report, u8 *data, int size)
{ {
struct rmi_data *hdata = hid_get_drvdata(hdev);
if (!(hdata->device_flags & RMI_DEVICE))
return 0;
size = rmi_check_sanity(hdev, data, size); size = rmi_check_sanity(hdev, data, size);
if (size < 2) if (size < 2)
return 0; return 0;
@ -713,9 +718,11 @@ static void rmi_remove(struct hid_device *hdev)
{ {
struct rmi_data *hdata = hid_get_drvdata(hdev); struct rmi_data *hdata = hid_get_drvdata(hdev);
if (hdata->device_flags & RMI_DEVICE) {
clear_bit(RMI_STARTED, &hdata->flags); clear_bit(RMI_STARTED, &hdata->flags);
cancel_work_sync(&hdata->reset_work); cancel_work_sync(&hdata->reset_work);
rmi_unregister_transport_device(&hdata->xport); rmi_unregister_transport_device(&hdata->xport);
}
hid_hw_stop(hdev); hid_hw_stop(hdev);
} }