Skip to content

Commit

Permalink
Merge tag 'usb-serial-5.8-rc6' of https://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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
  • Loading branch information
Greg Kroah-Hartman committed Jul 16, 2020
2 parents d1c0d96 + e7b931b commit c7300cd
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/usb/serial/iuu_phoenix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c7300cd

Please sign in to comment.