Commit 4c767ce4 authored by Colin Ian King's avatar Colin Ian King Committed by Mika Westerberg

thunderbolt: Ensure left shift of 512 does not overflow a 32 bit int

The 32 bit int value 512 is being left shifted and then used in a context
that expects the expression to be a larger unsigned long. There may be
a potential integer overflow, so make 512 a UL before shift to avoid
any such issues.

Addresses-Coverity: ("Uninintentional integer overflow")
Fixes: 3b1d8d57 ("thunderbolt: Implement USB3 bandwidth negotiation routines")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent dacb1287
...@@ -1368,7 +1368,7 @@ static unsigned int usb3_bw_to_mbps(u32 bw, u8 scale) ...@@ -1368,7 +1368,7 @@ static unsigned int usb3_bw_to_mbps(u32 bw, u8 scale)
{ {
unsigned long uframes; unsigned long uframes;
uframes = bw * 512 << scale; uframes = bw * 512UL << scale;
return DIV_ROUND_CLOSEST(uframes * 8000, 1000 * 1000); return DIV_ROUND_CLOSEST(uframes * 8000, 1000 * 1000);
} }
...@@ -1378,7 +1378,7 @@ static u32 mbps_to_usb3_bw(unsigned int mbps, u8 scale) ...@@ -1378,7 +1378,7 @@ static u32 mbps_to_usb3_bw(unsigned int mbps, u8 scale)
/* 1 uframe is 1/8 ms (125 us) -> 1 / 8000 s */ /* 1 uframe is 1/8 ms (125 us) -> 1 / 8000 s */
uframes = ((unsigned long)mbps * 1000 * 1000) / 8000; uframes = ((unsigned long)mbps * 1000 * 1000) / 8000;
return DIV_ROUND_UP(uframes, 512 << scale); return DIV_ROUND_UP(uframes, 512UL << scale);
} }
static int usb4_usb3_port_read_allocated_bandwidth(struct tb_port *port, static int usb4_usb3_port_read_allocated_bandwidth(struct tb_port *port,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment