Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 16ae2a877bf4179737921235e85ceffd7b79354f

Authored by Alan Cox
Committed by Greg Kroah-Hartman
1 parent 4547be7809
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

serial: Fix crash if the minimum rate of the device is > 9600 baud 

In that situation if the old rate is invalid and the new rate is invalid
and the chip cannot do 9600 baud we report zero, which makes all the
drivers explode.

Instead force the rate based on min/max

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 12 additions and 5 deletions Side-by-side Diff

drivers/serial/serial_core.c
Diff comments   View file @ 16ae2a8
... ... @@ -385,13 +385,20 @@
385 385 }
386 386  
387 387 /*
388   - * As a last resort, if the quotient is zero,
389   - * default to 9600 bps
  388 + * As a last resort, if the range cannot be met then clip to
  389 + * the nearest chip supported rate.
390 390 */
391   - if (!hung_up)
392   - tty_termios_encode_baud_rate(termios, 9600, 9600);
  391 + if (!hung_up) {
  392 + if (baud <= min)
  393 + tty_termios_encode_baud_rate(termios,
  394 + min + 1, min + 1);
  395 + else
  396 + tty_termios_encode_baud_rate(termios,
  397 + max - 1, max - 1);
  398 + }
393 399 }
394   -
  400 + /* Should never happen */
  401 + WARN_ON(1);
395 402 return 0;
396 403 }
397 404