diff options
author | Guenter Roeck <linux@roeck-us.net> | 2017-03-20 17:30:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-20 08:28:36 -0400 |
commit | 219a99dd219841ce659ddfc34ec6f191b73db109 (patch) | |
tree | 17313d02645b1837fb18f9905a9f65bb8e9eff11 | |
parent | 181b0de7f7cc80bfaca75b69872e4648fc03c782 (diff) |
usb: hub: Do not attempt to autosuspend disconnected devices
commit f5cccf49428447dfbc9edb7a04bb8fc316269781 upstream.
While running a bind/unbind stress test with the dwc3 usb driver on rk3399,
the following crash was observed.
Unable to handle kernel NULL pointer dereference at virtual address 00000218
pgd = ffffffc00165f000
[00000218] *pgd=000000000174f003, *pud=000000000174f003,
*pmd=0000000001750003, *pte=00e8000001751713
Internal error: Oops: 96000005 [#1] PREEMPT SMP
Modules linked in: uinput uvcvideo videobuf2_vmalloc cmac
ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat rfcomm
xt_mark fuse bridge stp llc zram btusb btrtl btbcm btintel bluetooth
ip6table_filter mwifiex_pcie mwifiex cfg80211 cdc_ether usbnet r8152 mii joydev
snd_seq_midi snd_seq_midi_event snd_rawmidi snd_seq snd_seq_device ppp_async
ppp_generic slhc tun
CPU: 1 PID: 29814 Comm: kworker/1:1 Not tainted 4.4.52 #507
Hardware name: Google Kevin (DT)
Workqueue: pm pm_runtime_work
task: ffffffc0ac540000 ti: ffffffc0af4d4000 task.ti: ffffffc0af4d4000
PC is at autosuspend_check+0x74/0x174
LR is at autosuspend_check+0x70/0x174
...
Call trace:
[<ffffffc00080dcc0>] autosuspend_check+0x74/0x174
[<ffffffc000810500>] usb_runtime_idle+0x20/0x40
[<ffffffc000785ae0>] __rpm_callback+0x48/0x7c
[<ffffffc000786af0>] rpm_idle+0x1e8/0x498
[<ffffffc000787cdc>] pm_runtime_work+0x88/0xcc
[<ffffffc000249bb8>] process_one_work+0x390/0x6b8
[<ffffffc00024abcc>] worker_thread+0x480/0x610
[<ffffffc000251a80>] kthread+0x164/0x178
[<ffffffc0002045d0>] ret_from_fork+0x10/0x40
Source:
(gdb) l *0xffffffc00080dcc0
0xffffffc00080dcc0 is in autosuspend_check
(drivers/usb/core/driver.c:1778).
1773 /* We don't need to check interfaces that are
1774 * disabled for runtime PM. Either they are unbound
1775 * or else their drivers don't support autosuspend
1776 * and so they are permanently active.
1777 */
1778 if (intf->dev.power.disable_depth)
1779 continue;
1780 if (atomic_read(&intf->dev.power.usage_count) > 0)
1781 return -EBUSY;
1782 w |= intf->needs_remote_wakeup;
Code analysis shows that intf is set to NULL in usb_disable_device() prior
to setting actconfig to NULL. At the same time, usb_runtime_idle() does not
lock the usb device, and neither does any of the functions in the
traceback. This means that there is no protection against a race condition
where usb_disable_device() is removing dev->actconfig->interface[] pointers
while those are being accessed from autosuspend_check().
To solve the problem, synchronize and validate device state between
autosuspend_check() and usb_disconnect().
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/core/driver.c | 3 | ||||
-rw-r--r-- | drivers/usb/core/hub.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 3f6873b2ce32..0bb380a9fcf7 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
@@ -1778,6 +1778,9 @@ static int autosuspend_check(struct usb_device *udev) | |||
1778 | int w, i; | 1778 | int w, i; |
1779 | struct usb_interface *intf; | 1779 | struct usb_interface *intf; |
1780 | 1780 | ||
1781 | if (udev->state == USB_STATE_NOTATTACHED) | ||
1782 | return -ENODEV; | ||
1783 | |||
1781 | /* Fail if autosuspend is disabled, or any interfaces are in use, or | 1784 | /* Fail if autosuspend is disabled, or any interfaces are in use, or |
1782 | * any interface drivers require remote wakeup but it isn't available. | 1785 | * any interface drivers require remote wakeup but it isn't available. |
1783 | */ | 1786 | */ |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index a5768b6fe0e8..579900640faa 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -2085,6 +2085,12 @@ void usb_disconnect(struct usb_device **pdev) | |||
2085 | dev_info(&udev->dev, "USB disconnect, device number %d\n", | 2085 | dev_info(&udev->dev, "USB disconnect, device number %d\n", |
2086 | udev->devnum); | 2086 | udev->devnum); |
2087 | 2087 | ||
2088 | /* | ||
2089 | * Ensure that the pm runtime code knows that the USB device | ||
2090 | * is in the process of being disconnected. | ||
2091 | */ | ||
2092 | pm_runtime_barrier(&udev->dev); | ||
2093 | |||
2088 | usb_lock_device(udev); | 2094 | usb_lock_device(udev); |
2089 | 2095 | ||
2090 | hub_disconnect_children(udev); | 2096 | hub_disconnect_children(udev); |