diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2014-12-11 13:51:20 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-12-11 23:10:01 +0100 |
| commit | f486d9dbcc8bc2fc14aac0bf6e24637485107496 (patch) | |
| tree | 531578461e529eddb5522c92796420f68b2a4154 /drivers | |
| parent | 3a034a7a7d61c30809255c1fc27d47d52c8c1bb6 (diff) | |
| download | linux-f486d9dbcc8bc2fc14aac0bf6e24637485107496.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 4 |
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) if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP) { ret = wtp_allocate(hdev, id); if (ret) - return ret; + goto wtp_allocate_fail; } 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) if (id->group != HID_GROUP_LOGITECH_DJ_DEVICE) { if (!connected) { hid_err(hdev, "Device not connected"); + hid_device_io_stop(hdev); goto hid_parse_fail; } @@ -1186,6 +1187,7 @@ hid_hw_start_fail: hid_parse_fail: cancel_work_sync(&hidpp->work); mutex_destroy(&hidpp->send_mutex); +wtp_allocate_fail: hid_set_drvdata(hdev, NULL); return ret; } |