]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] Fix a deadlock in usbtest
authorFranck Bui-Huu <vagabon.xyz@gmail.com>
Mon, 15 May 2006 17:23:53 +0000 (19:23 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 21 Jun 2006 22:04:12 +0000 (15:04 -0700)
ctrl_complete functions acquires ctx->lock and tries to unlink
all queued urbs in case of errors through usb_unlink_urb func.
In its turn usb_unlink_urb calls, through the hcd driver,
usb_hcd_giveback_urb which calls ctrl_complete again. At this
time, ctx->lock is already taken by the same function.

Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/misc/usbtest.c

index ccc5e8238bd889581b2b445cdb4b26108b5c6644..b42ae6bfb12bcf4fb863483b37c6e42c378160da 100644 (file)
@@ -802,7 +802,9 @@ error:
 
                                if (u == urb || !u->dev)
                                        continue;
+                               spin_unlock(&ctx->lock);
                                status = usb_unlink_urb (u);
+                               spin_lock(&ctx->lock);
                                switch (status) {
                                case -EINPROGRESS:
                                case -EBUSY: