forked from Minki/linux
9472aff16c
The syzbot fuzzer found a lockdep violation in the rio500 driver:
======================================================
WARNING: possible circular locking dependency detected
5.3.0-rc2+ #23 Not tainted
------------------------------------------------------
syz-executor.2/20386 is trying to acquire lock:
00000000772249c6 (rio500_mutex){+.+.}, at: open_rio+0x16/0xc0
drivers/usb/misc/rio500.c:64
but task is already holding lock:
00000000d3e8f4b9 (minor_rwsem){++++}, at: usb_open+0x23/0x270
drivers/usb/core/file.c:39
which lock already depends on the new lock.
The problem is that the driver's open_rio() routine is called while
the usbcore's minor_rwsem is locked for reading, and it acquires the
rio500_mutex; whereas conversely, probe_rio() and disconnect_rio()
first acquire the rio500_mutex and then call usb_register_dev() or
usb_deregister_dev(), which lock minor_rwsem for writing.
The correct ordering of acquisition should be: minor_rwsem first, then
rio500_mutex (since the locking in open_rio() cannot be changed).
Thus, the probe and disconnect routines should avoid holding
rio500_mutex while doing their registration and deregistration.
This patch adjusts the code in those two routines to do just that. It
also relies on the fact that the probe and disconnect routines are
protected by the device mutex, so the initial test of rio->present
needs no extra locking.
Reported-by: syzbot+7bbcbe9c9ff0cd49592a@syzkaller.appspotmail.com
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Fixes:
|
||
|---|---|---|
| .. | ||
| sisusbvga | ||
| adutux.c | ||
| appledisplay.c | ||
| chaoskey.c | ||
| cypress_cy7c63.c | ||
| cytherm.c | ||
| ehset.c | ||
| emi26.c | ||
| emi62.c | ||
| ezusb.c | ||
| ftdi-elan.c | ||
| idmouse.c | ||
| iowarrior.c | ||
| isight_firmware.c | ||
| Kconfig | ||
| ldusb.c | ||
| legousbtower.c | ||
| lvstest.c | ||
| Makefile | ||
| rio500_usb.h | ||
| rio500.c | ||
| trancevibrator.c | ||
| usb251xb.c | ||
| usb3503.c | ||
| usb4604.c | ||
| usb_u132.h | ||
| usblcd.c | ||
| usbsevseg.c | ||
| usbtest.c | ||
| uss720.c | ||
| yurex.c | ||