USB: serial: whiteheat: fix slab corruption and endianness bug
Subsystems (3)
Johan Hovold
maintainercover USB: serial: whiteheat: fix slab corruption and endianness bug
These patches fix a user-controlled slab buffer corruption, and adds a missing endianess conversion when setting the line speed.
Greg, feel free to pick up the first one directly if you want.
Johan
Johan Hovold (2):
USB: serial: whiteheat: fix potential slab corruption
USB: serial: whiteheat: fix line-speed endianness
drivers/usb/serial/whiteheat.c | 13 ++++++++++--- drivers/usb/serial/whiteheat.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-)
Signature · 1 line
2.23.0
Johan Hovold
maintainerPATCH 1/2 USB: serial: whiteheat: fix potential slab corruption
Fix a user-controlled slab buffer overflow due to a missing sanity check on the bulk-out transfer buffer used for control requests.
--- drivers/usb/serial/whiteheat.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/usb/serial/whiteheat.c +4 -0
@@ -559,6 +559,10 @@ static int firm_send_command(struct usb_serial_port *port, __u8 command, command_port = port->serial->port[COMMAND_PORT ]; command_info =usb_get_serial_port_data (command_port); + +if (command_port->bulk_out_size < datasize +1 ) +return -EIO ; +mutex_lock (&command_info->mutex); command_info->command_finished = false;
Signature · 1 line
2.23.0
Johan Hovold
maintainerPATCH 2/2 USB: serial: whiteheat: fix line-speed endianness
In reply to Johan HovoldAdd missing endianness conversion when setting the line speed so that this driver might work also on big-endian machines.
Also use an unsigned format specifier in the corresponding debug message.
--- drivers/usb/serial/whiteheat.c | 9 ++++++--- drivers/usb/serial/whiteheat.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/usb/serial/whiteheat.c +6 -3
@@ -636,6 +636,7 @@ static void firm_setup_port(struct tty_struct *tty)struct device *dev = &port->dev;struct whiteheat_port_settings port_settings;unsigned int cflag = tty->termios.c_cflag; +speed_t baud; port_settings.port = port->port_number +1 ;
@@ -696,11 +697,13 @@ static void firm_setup_port(struct tty_struct *tty)dev_dbg (dev,"%s - XON = %2x, XOFF = %2x\n" , __func__, port_settings.xon, port_settings.xoff);/* get the baud rate wanted */ - port_settings.baud =tty_get_baud_rate (tty); -dev_dbg (dev,"%s - baud rate = %d\n" , __func__, port_settings.baud); + baud =tty_get_baud_rate (tty); + port_settings.baud =cpu_to_le32 (baud); +dev_dbg (dev,"%s - baud rate = %u\n" , __func__, baud);/* fixme: should set validated settings */ -tty_encode_baud_rate (tty, port_settings.baud, port_settings.baud); +tty_encode_baud_rate (tty, baud, baud); +/* handle any settings that aren't specified in the tty structure */ port_settings.lloop =0 ;
drivers/usb/serial/whiteheat.h +1 -1
@@ -87,7 +87,7 @@ struct whiteheat_simple {struct whiteheat_port_settings {__u8 port;/* port number (1 to N) */ -__u32 baud;/* any value 7 - 460800, firmware calculates +__le32 baud;/* any value 7 - 460800, firmware calculates best fit; arrives little endian */ __u8 bits;/* 5, 6, 7, or 8 */ __u8 stop;/* 1 or 2, default 1 (2 = 1.5 if bits = 5) */
Signature · 1 line
2.23.0