Skip to content

Commit

Permalink
USB: serial: io_ti: fix information leak in completion handler
Browse files Browse the repository at this point in the history
commit 654b404 upstream.

Add missing sanity check to the bulk-in completion handler to avoid an
integer underflow that can be triggered by a malicious device.

This avoids leaking 128 kB of memory content from after the URB transfer
buffer to user space.

Fixes: 8c209e6 ("USB: make actual_length in struct urb field u32")
Fixes: 1da177e ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
Johan Hovold authored and Ben Hutchings committed Jun 5, 2017
1 parent 3d22135 commit 6d0c587
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/serial/io_ti.c
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,7 @@ static void edge_bulk_in_callback(struct urb *urb)

port_number = edge_port->port->number - edge_port->port->serial->minor;

if (edge_port->lsr_event) {
if (urb->actual_length > 0 && edge_port->lsr_event) {
edge_port->lsr_event = 0;
dbg("%s ===== Port %u LSR Status = %02x, Data = %02x ======",
__func__, port_number, edge_port->lsr_mask, *data);
Expand Down

0 comments on commit 6d0c587

Please sign in to comment.