From: "Marek Behún" <kabel@kernel.org>
To: linux-serial@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Pali Rohár" <pali@kernel.org>, "Marek Behún" <kabel@kernel.org>
Subject: [PATCH 1/7] USB: serial: ftdi_sio: Fix divisor overflow
Date: Thu, 7 Jul 2022 16:53:48 +0200 [thread overview]
Message-ID: <20220707145354.29705-2-kabel@kernel.org> (raw)
In-Reply-To: <20220707145354.29705-1-kabel@kernel.org>
From: Pali Rohár <pali@kernel.org>
Divisor in the register is a 17-bit wide number.
Therefore we need to clamp it on overflow.
Signed-off-by: Pali Rohár <pali@kernel.org>
Tested-by: Marek Behún <kabel@kernel.org>
---
drivers/usb/serial/ftdi_sio.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index b440d338a895..ea40f367e70c 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1157,6 +1157,8 @@ static unsigned short int ftdi_232am_baud_base_to_divisor(int baud, int base)
int divisor3 = DIV_ROUND_CLOSEST(base, 2 * baud);
if ((divisor3 & 0x7) == 7)
divisor3++; /* round x.7/8 up to x+1 */
+ if (divisor3 > GENMASK(16, 0))
+ divisor3 = GENMASK(16, 0);
divisor = divisor3 >> 3;
divisor3 &= 0x7;
if (divisor3 == 1)
@@ -1181,6 +1183,8 @@ static u32 ftdi_232bm_baud_base_to_divisor(int baud, int base)
u32 divisor;
/* divisor shifted 3 bits to the left */
int divisor3 = DIV_ROUND_CLOSEST(base, 2 * baud);
+ if (divisor3 > GENMASK(16, 0))
+ divisor3 = GENMASK(16, 0);
divisor = divisor3 >> 3;
divisor |= (u32)divfrac[divisor3 & 0x7] << 14;
/* Deal with special cases for highest baud rates. */
@@ -1204,6 +1208,8 @@ static u32 ftdi_2232h_baud_base_to_divisor(int baud, int base)
/* hi-speed baud rate is 10-bit sampling instead of 16-bit */
divisor3 = DIV_ROUND_CLOSEST(8 * base, 10 * baud);
+ if (divisor3 > GENMASK(16, 0))
+ divisor3 = GENMASK(16, 0);
divisor = divisor3 >> 3;
divisor |= (u32)divfrac[divisor3 & 0x7] << 14;
--
2.35.1
next prev parent reply other threads:[~2022-07-07 14:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-07 14:53 [PATCH 0/7] ftdi_sio driver improvements Marek Behún
2022-07-07 14:53 ` Marek Behún [this message]
2022-07-07 15:07 ` [PATCH 1/7] USB: serial: ftdi_sio: Fix divisor overflow Greg Kroah-Hartman
2022-07-07 15:37 ` Marek Behún
2022-07-07 15:50 ` Greg Kroah-Hartman
2022-07-07 14:53 ` [PATCH 2/7] USB: serial: ftdi_sio: Add missing baudrate validation Marek Behún
2022-07-07 15:08 ` Greg Kroah-Hartman
2022-07-07 16:22 ` Marek Behún
2022-07-07 16:50 ` Greg Kroah-Hartman
2022-07-07 14:53 ` [PATCH 3/7] USB: serial: ftdi_sio: Extract SIO divisor code to function Marek Behún
2022-07-07 15:06 ` Greg Kroah-Hartman
2022-07-07 15:41 ` Marek Behún
2022-07-07 15:09 ` Greg Kroah-Hartman
2022-07-07 15:50 ` Marek Behún
2022-07-07 14:53 ` [PATCH 4/7] USB: serial: ftdi_sio: Do not reset baudrate to 9600 on error Marek Behún
2022-07-07 15:10 ` Greg Kroah-Hartman
2022-07-07 15:52 ` Marek Behún
2022-07-07 16:06 ` Greg Kroah-Hartman
2022-07-08 15:51 ` Andy Shevchenko
2022-07-12 11:28 ` m.brock
2022-07-12 12:09 ` Marek Behún
2022-07-12 12:11 ` Marek Behún
2022-07-07 14:53 ` [PATCH 5/7] USB: serial: ftdi_sio: Fix baudrate rounding for ASYNC_SPD_CUST Marek Behún
2022-07-07 15:11 ` Greg Kroah-Hartman
2022-07-07 16:08 ` Marek Behún
2022-07-07 16:12 ` Greg Kroah-Hartman
2022-07-07 14:53 ` [PATCH 6/7] USB: serial: ftdi_sio: Fix custom_divisor and c_*speed " Marek Behún
2022-07-07 14:53 ` [PATCH 7/7] USB: serial: ftdi_sio: Fill c_*speed fields with real baudrate Marek Behún
2022-07-07 15:11 ` Greg Kroah-Hartman
2022-07-07 15:07 ` [PATCH 0/7] ftdi_sio driver improvements Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220707145354.29705-2-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-serial@vger.kernel.org \
--cc=pali@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).