]> www.infradead.org Git - users/jedix/linux-maple.git/commit
HID: usbhid: fix recursive deadlock
authorIoan-Adrian Ratiu <adi@adirat.com>
Fri, 20 Nov 2015 20:19:02 +0000 (22:19 +0200)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:45:47 +0000 (15:45 -0700)
commit7d0c4fa158020bf51acdc9755434158398bf5d8c
tree25e195038ae2a2ced21d1039a9fa5064498e5c69
parent7076b3e8650796c46bc93870d14dfdf70da91cb2
HID: usbhid: fix recursive deadlock

Orabug: 23331016

[ Upstream commit e470127e9606b1fa151c4184243e61296d1e0c0f ]

The critical section protected by usbhid->lock in hid_ctrl() is too
big and because of this it causes a recursive deadlock. "Too big" means
the case statement and the call to hid_input_report() do not need to be
protected by the spinlock (no URB operations are done inside them).

The deadlock happens because in certain rare cases drivers try to grab
the lock while handling the ctrl irq which grabs the lock before them
as described above. For example newer wacom tablets like 056a:033c try
to reschedule proximity reads from wacom_intuos_schedule_prox_event()
calling hid_hw_request() -> usbhid_request() -> usbhid_submit_report()
which tries to grab the usbhid lock already held by hid_ctrl().

There are two ways to get out of this deadlock:
    1. Make the drivers work "around" the ctrl critical region, in the
    wacom case for ex. by delaying the scheduling of the proximity read
    request itself to a workqueue.
    2. Shrink the critical region so the usbhid lock protects only the
    instructions which modify usbhid state, calling hid_input_report()
    with the spinlock unlocked, allowing the device driver to grab the
    lock first, finish and then grab the lock afterwards in hid_ctrl().

This patch implements the 2nd solution.

Signed-off-by: Ioan-Adrian Ratiu <adi@adirat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit af24c621219ec87b221c1bbade56a506bf09deb9)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
drivers/hid/usbhid/hid-core.c