]> git.hungrycats.org Git - linux/commitdiff
USB: serial: mos7840: fix non-atomic allocation in write path
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Thu, 11 Aug 2016 22:05:09 +0000 (01:05 +0300)
committerJiri Slaby <jslaby@suse.cz>
Fri, 23 Sep 2016 07:29:22 +0000 (09:29 +0200)
commit 3b7c7e52efda0d4640060de747768360ba70a7c0 upstream.

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>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/usb/serial/mos7840.c

index a69da83604c03da3219c2340264cff08b456a404..29b33ecd048b4883c73c6cccd75e7b9ff9d1e1a3 100644 (file)
@@ -1379,8 +1379,8 @@ 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);
+               urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE,
+                                              GFP_ATOMIC);
 
                if (urb->transfer_buffer == NULL) {
                        dev_err_console(port, "%s no more kernel memory...\n",