2011-05-30 17:03:18

by Alexey Khoroshilov

Subject: [PATCH] drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()

The patch replaces GFP_KERNEL with GFP_ATOMIC.

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

Signed-off-by: Alexey Khoroshilov <[email protected]>
---
drivers/net/usb/catc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index d7221c4..8056f8a 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -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);
}

--
1.7.4.1

2011-05-30 17:07:43

by Alexey Khoroshilov

Subject: [PATCH] drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()

Sorry, I missed a description in the previous mail.


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 <[email protected]>
---
drivers/net/usb/catc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index d7221c4..8056f8a 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -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);
}

--
1.7.4.1

2011-05-31 22:30:50

by David Miller

Subject: Re: [PATCH] drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()

From: Alexey Khoroshilov <[email protected]>
Date: Mon, 30 May 2011 21:06:24 +0400

> 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 <[email protected]>

Applied.