drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Mon, 30 May 2011 07:06:24 +0000 (07:06 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 31 May 2011 22:30:17 +0000 (15:30 -0700)
catc_ctrl_run() calls usb_submit_urb() with GFP_KERNEL, while it is called from
catc_ctrl_async() and catc_ctrl_done() with catc->ctrl_lock spinlock held.

The patch replaces GFP_KERNEL with GFP_ATOMIC.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/catc.c

index d7221c4a5dcf97973b97ee50d93aec593a90b434..8056f8a27c6a0695f660648875dfeb0f60e7ee7e 100644 (file)
@@ -495,7 +495,7 @@ static void catc_ctrl_run(struct catc *catc)
        if (!q->dir && q->buf && q->len)
                memcpy(catc->ctrl_buf, q->buf, q->len);
 
-       if ((status = usb_submit_urb(catc->ctrl_urb, GFP_KERNEL)))
+       if ((status = usb_submit_urb(catc->ctrl_urb, GFP_ATOMIC)))
                err("submit(ctrl_urb) status %d", status);
 }