diff options
| author | Johan Hovold <johan@kernel.org> | 2014-08-27 13:55:19 +0400 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2014-09-25 07:49:16 +0400 |
| commit | c804743181ad14578d8ea5b2e7b8bd7a2efe64ae (patch) | |
| tree | 6dbdaa1273cc39cf8d229bd84ea9c3ab1d974eec | |
| parent | 62148f769ff1041f92bf0bad4dd820615f29861f (diff) | |
| download | linux-c804743181ad14578d8ea5b2e7b8bd7a2efe64ae.tar.xz | |
USB: serial: fix potential heap buffer overflow
commit 5654699fb38512bdbfc0f892ce54fce75bdc2bab upstream.
Make sure to verify the number of ports requested by subdriver to avoid
writing beyond the end of fixed-size array in interface data.
The current usb-serial implementation is limited to eight ports per
interface but failed to verify that the number of ports requested by a
subdriver (which could have been determined from device descriptors) did
not exceed this limit.
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[lizf: Backported to 3.4: s/ddev/\&interface->dev/]
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 815d86d40223..a08230ebe9c5 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -889,6 +889,11 @@ int usb_serial_probe(struct usb_interface *interface, num_ports = type->num_ports; } + if (num_ports > MAX_NUM_PORTS) { + dev_warn(&interface->dev, "too many ports requested: %d\n", num_ports); + num_ports = MAX_NUM_PORTS; + } + serial->num_ports = num_ports; serial->num_bulk_in = num_bulk_in; serial->num_bulk_out = num_bulk_out; |