Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d48bd977 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: fix locking loop by avoiding flush_scheduled_work 



This patch (as1027) replaces a call to flush_scheduled_work() -- a
dangerous routine to invoke, especially while holding any sort of lock
-- with calls to cancel_work_sync() and cancel_delayed_work_sync().

This fixes Bugzilla #9532.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f88ed90d

drivers/usb/core/hub.c

+3 −3
Original line number Diff line number Diff line
@@ -522,9 +522,9 @@ static void hub_quiesce(struct usb_hub *hub) 
	/* (blocking) stop khubd and related activity */

	usb_kill_urb(hub->urb);

	if (hub->has_indicators)

		cancel_delayed_work(&hub->leds);

	if (hub->has_indicators || hub->tt.hub)

		flush_scheduled_work();

		cancel_delayed_work_sync(&hub->leds);

	if (hub->tt.hub)

		cancel_work_sync(&hub->tt.kevent);

}



static void hub_activate(struct usb_hub *hub)