Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19125283 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: kobil_sct: fix non-atomic allocation in write path 



Write may be called from interrupt context so make sure to use
GFP_ATOMIC for all allocations in write.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 0df1f248

drivers/usb/serial/kobil_sct.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -335,7 +335,8 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port, 
			port->interrupt_out_urb->transfer_buffer_length = length;

			port->interrupt_out_urb->transfer_buffer_length = length;





			priv->cur_pos = priv->cur_pos + length;

			priv->cur_pos = priv->cur_pos + length;

			result = usb_submit_urb(port->interrupt_out_urb, GFP_NOIO);

			result = usb_submit_urb(port->interrupt_out_urb,

					GFP_ATOMIC);

			dev_dbg(&port->dev, "%s - Send write URB returns: %i\n", __func__, result);

			dev_dbg(&port->dev, "%s - Send write URB returns: %i\n", __func__, result);

			todo = priv->filled - priv->cur_pos;

			todo = priv->filled - priv->cur_pos;
@@ -350,7 +351,7 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port, 
		if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||

		if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||

			priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) {

			priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) {

			result = usb_submit_urb(port->interrupt_in_urb,

			result = usb_submit_urb(port->interrupt_in_urb,

								GFP_NOIO);

					GFP_ATOMIC);

			dev_dbg(&port->dev, "%s - Send read URB returns: %i\n", __func__, result);

			dev_dbg(&port->dev, "%s - Send read URB returns: %i\n", __func__, result);

		}

		}

	}

	}