[2/2] USB: mos7840: fix non-atomic allocation in write path
diff mbox series

Message ID 1470953109-4280-2-git-send-email-khoroshilov@ispras.ru
State New, archived
Headers show
Series
  • [1/2] USB: mos7720: fix non-atomic allocation in write path
Related show

Commit Message

Alexey Khoroshilov Aug. 11, 2016, 10:05 p.m. UTC
There is an allocation with GFP_KERNEL flag in mos7840_write(),
while it may be called from interrupt context.

Follow-up for commit 191252837626 ("USB: kobil_sct: fix non-atomic allocation in write path")

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

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
 drivers/usb/serial/mos7840.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Johan Hovold Aug. 15, 2016, 8:46 a.m. UTC | #1
On Fri, Aug 12, 2016 at 01:05:09AM +0300, Alexey Khoroshilov wrote:
> There is an allocation with GFP_KERNEL flag in mos7840_write(),
> while it may be called from interrupt context.
> 
> Follow-up for commit 191252837626 ("USB: kobil_sct: fix non-atomic allocation in write path")
> 
> Found by Linux Driver Verification project (linuxtesting.org).
> 
> Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
> ---
>  drivers/usb/serial/mos7840.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
> index ed378fb232e7..1de2c01c078d 100644
> --- a/drivers/usb/serial/mos7840.c
> +++ b/drivers/usb/serial/mos7840.c
> @@ -1341,7 +1341,7 @@ static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,
>  
>  	if (urb->transfer_buffer == NULL) {
>  		urb->transfer_buffer =
> -		    kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
> +		    kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_ATOMIC);

Both patches now applied. I fixed up the odd indentation here while at
it.

Thanks,
Johan

Patch
diff mbox series

diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index ed378fb232e7..1de2c01c078d 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1341,7 +1341,7 @@  static int mos7840_write(struct tty_struct *tty, struct usb_serial_port *port,
 
 	if (urb->transfer_buffer == NULL) {
 		urb->transfer_buffer =
-		    kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL);
+		    kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_ATOMIC);
 		if (!urb->transfer_buffer)
 			goto exit;
 	}