Commit bf3d7d40 authored Feb 02, 2011 by Alan Stern Committed by Greg Kroah-Hartman Feb 03, 2011

USB: fix race between root-hub resume and wakeup requests



The USB core keeps track of pending resume requests for root hubs, in
order to resolve races between wakeup requests and suspends.  However
the code that does this is subject to another race (between wakeup
requests and resumes) because the WAKEUP_PENDING flag is cleared
before the resume occurs, leaving a window in which another wakeup
request might arrive.

This patch (as1447) fixes the problem by clearing the WAKEUP_PENDING
flag after the resume instead of before it.

This fixes Bugzilla #24952.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Paul Bender <pebender@san.rr.com>
Tested-by: warpme <warpme@o2.pl>
Cc: stable <stable@kernel.org> [.36+]
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent d199c96d

drivers/usb/core/hcd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1955,7 +1955,6 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)

		dev_dbg(&rhdev->dev, "usb %s%s\n",
		(msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume");
		clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
		if (!hcd->driver->bus_resume)
		return -ENOENT;
		if (hcd->state == HC_STATE_RUNNING)
		@@ -1963,6 +1962,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg)

		hcd->state = HC_STATE_RESUMING;
		status = hcd->driver->bus_resume(hcd);
		clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags);
		if (status == 0) {
		/* TRSMRCY = 10 msec */
		msleep(10);

Admin message