Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de01e6cd authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

serial: sh-sci: Avoid overflow in sci_baud_calc_hscif() 



If bps >= 1048576, the multiplication of the predivider and "bps" will
overflow, and both br and err will contain bogus values.
Skip the current and all higher clock select predividers when overflow
is detected.  Simplify the calculations using intermediates while we're
at it.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95a2703e

drivers/tty/serial/sh-sci.c

+19 −6
Original line number Diff line number Diff line
@@ -1870,7 +1870,7 @@ static unsigned int sci_scbrr_calc(struct sci_port *s, unsigned int bps, 
static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,

				unsigned int *srr, unsigned int *cks)

{

	unsigned int sr, br, c;

	unsigned int sr, br, prediv, scrate, c;

	int err, recv_margin;

	int min_err = 1000; /* 100% */

	int recv_max_margin = 0;
@@ -1880,11 +1880,24 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr, 
	for (sr = 8; sr <= 32; sr++) {

		for (c = 0; c <= 3; c++) {

			/* integerized formulas from HSCIF documentation */

			br = DIV_ROUND_CLOSEST(freq, (sr *

					      (1 << (2 * c + 1)) * bps));

			prediv = sr * (1 << (2 * c + 1));



			/*

			 * We need to calculate:

			 *

			 *     br = freq / (prediv * bps) clamped to [1..256]

			 *     err = (freq / (br * prediv * bps / 1000)) - 1000

			 *

			 * Watch out for overflow when calculating the desired

			 * sampling clock rate!

			 */

			if (bps > UINT_MAX / prediv)

				break;



			scrate = prediv * bps;

			br = DIV_ROUND_CLOSEST(freq, scrate);

			br = clamp(br, 1U, 256U);

			err = DIV_ROUND_CLOSEST(freq, (br * bps * sr *

					       (1 << (2 * c + 1)) / 1000)) -

			err = DIV_ROUND_CLOSEST(freq, (br * scrate) / 1000) -

			      1000;

			/* Calc recv margin

			 * M: Receive margin (%)