diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-16 17:30:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-16 17:30:59 +0200 |
| commit | c7300cdf8f683ae00cf74616b5fd14ffac327979 (patch) | |
| tree | 6ecd242dfb6586fdf510ff5e98847f80fc241df6 | |
| parent | d1c0d96535d7464d1111727c79d6dac274b8bc4f (diff) | |
| parent | e7b931bee739e8a77ae216e613d3b99342b6dec0 (diff) | |
| download | linux-c7300cdf8f683ae00cf74616b5fd14ffac327979.tar.gz linux-c7300cdf8f683ae00cf74616b5fd14ffac327979.tar.bz2 linux-c7300cdf8f683ae00cf74616b5fd14ffac327979.zip | |
Merge tag 'usb-serial-5.8-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for 5.8-rc6
Here's a fix for 5.8 addressing a long-standing bug in iuu_phoenix.
* tag 'usb-serial-5.8-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
USB: serial: iuu_phoenix: fix memory corruption
| -rw-r--r-- | drivers/usb/serial/iuu_phoenix.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index d5bff69b1769..b8dfeb4fb2ed 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c @@ -697,14 +697,16 @@ static int iuu_uart_write(struct tty_struct *tty, struct usb_serial_port *port, struct iuu_private *priv = usb_get_serial_port_data(port); unsigned long flags; - if (count > 256) - return -ENOMEM; - spin_lock_irqsave(&priv->lock, flags); + count = min(count, 256 - priv->writelen); + if (count == 0) + goto out; + /* fill the buffer */ memcpy(priv->writebuf + priv->writelen, buf, count); priv->writelen += count; +out: spin_unlock_irqrestore(&priv->lock, flags); return count; |