]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: kobil_sct: fix non-atomic allocation in write path
authorJohan Hovold <johan@kernel.org>
Wed, 29 Oct 2014 08:07:30 +0000 (09:07 +0100)
committerWilly Tarreau <w@1wt.eu>
Sun, 23 Nov 2014 09:55:46 +0000 (10:55 +0100)
Write may be called from interrupt context so make sure to use
GFP_ATOMIC for all allocations in write.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
(cherry picked from commit 191252837626fca0de694c18bb2aa64c118eda89)
Signed-off-by: Willy Tarreau <w@1wt.eu>
drivers/usb/serial/kobil_sct.c

index 929ceb11179cce12ee48e0bda1a752729a594e79..935f6e31787ccfc05683814802109319e66a81ac 100644 (file)
@@ -464,7 +464,7 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
                        );
 
                        priv->cur_pos = priv->cur_pos + length;
-                       result = usb_submit_urb(port->write_urb, GFP_NOIO);
+                       result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                        dbg("%s - port %d Send write URB returns: %i",
                                        __func__, port->number, result);
                        todo = priv->filled - priv->cur_pos;
@@ -488,7 +488,7 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
                        port->interrupt_in_urb->dev = port->serial->dev;
 
                        result = usb_submit_urb(port->interrupt_in_urb,
-                                                               GFP_NOIO);
+                                                               GFP_ATOMIC);
                        dbg("%s - port %d Send read URB returns: %i",
                                        __func__, port->number, result);
                }