diff options
| author | Johan Hovold <johan@kernel.org> | 2019-10-29 11:23:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-06 13:06:17 +0100 |
| commit | b7ad5aa67058ffd96fa83e859ebe12dce340dcc9 (patch) | |
| tree | 68ce019daa9b3177b62ba33585a740c007391822 | |
| parent | 36e02e1fba89dd5049aa46587ae2f287cc8eb507 (diff) | |
| download | linux-stable-b7ad5aa67058ffd96fa83e859ebe12dce340dcc9.tar.gz linux-stable-b7ad5aa67058ffd96fa83e859ebe12dce340dcc9.tar.bz2 linux-stable-b7ad5aa67058ffd96fa83e859ebe12dce340dcc9.zip | |
USB: serial: whiteheat: fix potential slab corruption
commit 1251dab9e0a2c4d0d2d48370ba5baa095a5e8774 upstream.
Fix a user-controlled slab buffer overflow due to a missing sanity check
on the bulk-out transfer buffer used for control requests.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20191029102354.2733-2-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/serial/whiteheat.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 1c7b46a8620c..fb2f90726d35 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c @@ -571,6 +571,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; |