diff options
| author | Andrew Duggan <aduggan@synaptics.com> | 2016-01-26 15:40:36 -0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-01-27 22:39:32 +0100 |
| commit | b786ae8e269b5b30fea5efaab8cba32ba9aece61 (patch) | |
| tree | e28df6aedf5fdef43d4364ec8bd1ec7aa05582ff /drivers/hid/hid-rmi.c | |
| parent | 962b7a0e77015802f0ceefe6f0e3cad3f10fd4f8 (diff) | |
| download | lwn-b786ae8e269b5b30fea5efaab8cba32ba9aece61.tar.gz lwn-b786ae8e269b5b30fea5efaab8cba32ba9aece61.zip | |
HID: rmi: Check that the device is a RMI device in suspend and resume callbacks
Commit 092563604217 ("HID: rmi: Disable scanning if the device is not a wake
source") introduced a regression for devices which use hid-rmi to handle
composite USB devices. The suspend or resume callbacks are not checking
that the device is a RMI device before calling rmi_read or rmi_write.
This results in dereferencing uninitialized variables on non RMI devices. This
patch checks that the RMI_DEVICE flag is set before sending RMI commands to the
device.
Reported-by: Rodrigo Gomes <rodrigo.toste.gomes@gmail.com>
Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-rmi.c')
| -rw-r--r-- | drivers/hid/hid-rmi.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 67cd059a8f46..9cd2ca34a6be 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -594,6 +594,9 @@ static int rmi_suspend(struct hid_device *hdev, pm_message_t message) int ret; u8 buf[RMI_F11_CTRL_REG_COUNT]; + if (!(data->device_flags & RMI_DEVICE)) + return 0; + ret = rmi_read_block(hdev, data->f11.control_base_addr, buf, RMI_F11_CTRL_REG_COUNT); if (ret) @@ -613,6 +616,9 @@ static int rmi_post_reset(struct hid_device *hdev) struct rmi_data *data = hid_get_drvdata(hdev); int ret; + if (!(data->device_flags & RMI_DEVICE)) + return 0; + ret = rmi_reset_attn_mode(hdev); if (ret) { hid_err(hdev, "can not set rmi mode\n"); @@ -640,6 +646,11 @@ static int rmi_post_reset(struct hid_device *hdev) static int rmi_post_resume(struct hid_device *hdev) { + struct rmi_data *data = hid_get_drvdata(hdev); + + if (!(data->device_flags & RMI_DEVICE)) + return 0; + return rmi_reset_attn_mode(hdev); } #endif /* CONFIG_PM */ |