diff options
author | Johan Hovold <johan@kernel.org> | 2017-05-11 05:41:21 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-25 09:44:40 -0400 |
commit | f9cd79e0ad1fa620ff34715d24ae1b671c97bc91 (patch) | |
tree | 6c602abae609be27268a38921def55b0927e0629 /drivers | |
parent | c3e024ff91806856059c2fad64ad535bf6bf37eb (diff) |
USB: serial: io_ti: fix div-by-zero in set_termios
commit 6aeb75e6adfaed16e58780309613a578fe1ee90b upstream.
Fix a division-by-zero in set_termios when debugging is enabled and a
high-enough speed has been requested so that the divisor value becomes
zero.
Instead of just fixing the offending debug statement, cap the baud rate
at the base as a zero divisor value also appears to crash the firmware.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/io_ti.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index f1a8fdcd8674..e98532feb0cc 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -2349,8 +2349,11 @@ static void change_port_settings(struct tty_struct *tty, | |||
2349 | if (!baud) { | 2349 | if (!baud) { |
2350 | /* pick a default, any default... */ | 2350 | /* pick a default, any default... */ |
2351 | baud = 9600; | 2351 | baud = 9600; |
2352 | } else | 2352 | } else { |
2353 | /* Avoid a zero divisor. */ | ||
2354 | baud = min(baud, 461550); | ||
2353 | tty_encode_baud_rate(tty, baud, baud); | 2355 | tty_encode_baud_rate(tty, baud, baud); |
2356 | } | ||
2354 | 2357 | ||
2355 | edge_port->baud_rate = baud; | 2358 | edge_port->baud_rate = baud; |
2356 | config->wBaudRate = (__u16)((461550L + baud/2) / baud); | 2359 | config->wBaudRate = (__u16)((461550L + baud/2) / baud); |