From a83c18d05dca7eb67de62d4326f509be6f5962de Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Dec 2022 13:37:32 +0100 Subject: [PATCH] 5.4-stable patches added patches: usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch --- queue-5.4/series | 2 + ...ivision-by-zero-on-line-speed-change.patch | 52 +++++++++++++++++++ ...ivision-by-zero-on-line-speed-change.patch | 52 +++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 queue-5.4/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch create mode 100644 queue-5.4/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch diff --git a/queue-5.4/series b/queue-5.4/series index 18bbe950500..93d211da094 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -6,3 +6,5 @@ udf-fix-extending-file-within-last-block.patch usb-gadget-uvc-prevent-buffer-overflow-in-setup-handler.patch usb-serial-option-add-quectel-em05-g-modem.patch usb-serial-cp210x-add-kamstrup-rf-sniffer-pids.patch +usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch +usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch diff --git a/queue-5.4/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch b/queue-5.4/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch new file mode 100644 index 00000000000..c262209ce36 --- /dev/null +++ b/queue-5.4/usb-serial-f81232-fix-division-by-zero-on-line-speed-change.patch @@ -0,0 +1,52 @@ +From a08ca6ebafe615c9028c53fc4c9e6c9b2b1f2888 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 29 Nov 2022 15:17:49 +0100 +Subject: USB: serial: f81232: fix division by zero on line-speed change + +From: Johan Hovold + +commit a08ca6ebafe615c9028c53fc4c9e6c9b2b1f2888 upstream. + +The driver leaves the line speed unchanged in case a requested speed is +not supported. Make sure to handle the case where the current speed is +B0 (hangup) without dividing by zero when determining the clock source. + +Fixes: 268ddb5e9b62 ("USB: serial: f81232: add high baud rate support") +Cc: stable@vger.kernel.org # 5.2 +Cc: Ji-Ze Hong (Peter Hong) +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/f81232.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/drivers/usb/serial/f81232.c ++++ b/drivers/usb/serial/f81232.c +@@ -78,9 +78,6 @@ static u8 const clock_table[] = { F81232 + + static int calc_baud_divisor(speed_t baudrate, speed_t clockrate) + { +- if (!baudrate) +- return 0; +- + return DIV_ROUND_CLOSEST(clockrate, baudrate); + } + +@@ -423,9 +420,14 @@ static void f81232_set_baudrate(struct t + speed_t baud_list[] = { baudrate, old_baudrate, F81232_DEF_BAUDRATE }; + + for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { +- idx = f81232_find_clk(baud_list[i]); ++ baudrate = baud_list[i]; ++ if (baudrate == 0) { ++ tty_encode_baud_rate(tty, 0, 0); ++ return; ++ } ++ ++ idx = f81232_find_clk(baudrate); + if (idx >= 0) { +- baudrate = baud_list[i]; + tty_encode_baud_rate(tty, baudrate, baudrate); + break; + } diff --git a/queue-5.4/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch b/queue-5.4/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch new file mode 100644 index 00000000000..def9ce6ec94 --- /dev/null +++ b/queue-5.4/usb-serial-f81534-fix-division-by-zero-on-line-speed-change.patch @@ -0,0 +1,52 @@ +From 188c9c2e0c7f4ae864113f80c40bafb394062271 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 29 Nov 2022 15:18:19 +0100 +Subject: USB: serial: f81534: fix division by zero on line-speed change + +From: Johan Hovold + +commit 188c9c2e0c7f4ae864113f80c40bafb394062271 upstream. + +The driver leaves the line speed unchanged in case a requested speed is +not supported. Make sure to handle the case where the current speed is +B0 (hangup) without dividing by zero when determining the clock source. + +Fixes: 3aacac02f385 ("USB: serial: f81534: add high baud rate support") +Cc: stable@vger.kernel.org # 4.16 +Cc: Ji-Ze Hong (Peter Hong) +Reviewed-by: Greg Kroah-Hartman +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/f81534.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/drivers/usb/serial/f81534.c ++++ b/drivers/usb/serial/f81534.c +@@ -538,9 +538,6 @@ static int f81534_submit_writer(struct u + + static u32 f81534_calc_baud_divisor(u32 baudrate, u32 clockrate) + { +- if (!baudrate) +- return 0; +- + /* Round to nearest divisor */ + return DIV_ROUND_CLOSEST(clockrate, baudrate); + } +@@ -570,9 +567,14 @@ static int f81534_set_port_config(struct + u32 baud_list[] = {baudrate, old_baudrate, F81534_DEFAULT_BAUD_RATE}; + + for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { +- idx = f81534_find_clk(baud_list[i]); ++ baudrate = baud_list[i]; ++ if (baudrate == 0) { ++ tty_encode_baud_rate(tty, 0, 0); ++ return 0; ++ } ++ ++ idx = f81534_find_clk(baudrate); + if (idx >= 0) { +- baudrate = baud_list[i]; + tty_encode_baud_rate(tty, baudrate, baudrate); + break; + } -- 2.47.3