aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-12-11 07:51:20 -0500
committerJiri Kosina <jkosina@suse.cz>2014-12-11 17:10:01 -0500
commitf486d9dbcc8bc2fc14aac0bf6e24637485107496 (patch)
tree531578461e529eddb5522c92796420f68b2a4154
parent3a034a7a7d61c30809255c1fc27d47d52c8c1bb6 (diff)
HID: logitech-hidpp: disable io in probe error path
Balance a hid_device_io_start() call with hid_device_io_stop() in the error path. This avoids processing of HID reports when the probe fails which possibly leads to invalid memory access in hid_device_probe() as report_enum->report_id_hash might already be freed via hid_close_report(). hid_set_drvdata() is called before wtp_allocate, be consistent and clear drvdata too on the error path of wtp_allocate. Signed-off-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-logitech-hidpp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 4292cc33c119..2f420c0b6609 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -1121,7 +1121,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
1121 if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) { 1121 if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) {
1122 ret = wtp_allocate(hdev, id); 1122 ret = wtp_allocate(hdev, id);
1123 if (ret) 1123 if (ret)
1124 return ret; 1124 goto wtp_allocate_fail;
1125 } 1125 }
1126 1126
1127 INIT_WORK(&hidpp->work, delayed_work_cb); 1127 INIT_WORK(&hidpp->work, delayed_work_cb);
@@ -1141,6 +1141,7 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
1141 if (id->group != HID_GROUP_LOGITECH_DJ_DEVICE) { 1141 if (id->group != HID_GROUP_LOGITECH_DJ_DEVICE) {
1142 if (!connected) { 1142 if (!connected) {
1143 hid_err(hdev, "Device not connected"); 1143 hid_err(hdev, "Device not connected");
1144 hid_device_io_stop(hdev);
1144 goto hid_parse_fail; 1145 goto hid_parse_fail;
1145 } 1146 }
1146 1147
@@ -1186,6 +1187,7 @@ hid_hw_start_fail:
1186hid_parse_fail: 1187hid_parse_fail:
1187 cancel_work_sync(&hidpp->work); 1188 cancel_work_sync(&hidpp->work);
1188 mutex_destroy(&hidpp->send_mutex); 1189 mutex_destroy(&hidpp->send_mutex);
1190wtp_allocate_fail:
1189 hid_set_drvdata(hdev, NULL); 1191 hid_set_drvdata(hdev, NULL);
1190 return ret; 1192 return ret;
1191} 1193}