summaryrefslogtreecommitdiffstats
path: root/drivers/thunderbolt
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-06-30 16:55:58 +0200
committerMika Westerberg <mika.westerberg@linux.intel.com>2020-07-01 12:46:47 +0200
commit4c767ce48cf858971545164c4c53d028e6241c07 (patch)
tree3d3d39467783b85594a86c3c176d7f00c5f01e59 /drivers/thunderbolt
parentthunderbolt: Add support for on-board retimers (diff)
downloadlinux-4c767ce48cf858971545164c4c53d028e6241c07.tar.xz
linux-4c767ce48cf858971545164c4c53d028e6241c07.zip
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: 3b1d8d577ca8 ("thunderbolt: Implement USB3 bandwidth negotiation routines") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/thunderbolt')
-rw-r--r--drivers/thunderbolt/usb4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thunderbolt/usb4.c b/drivers/thunderbolt/usb4.c
index 966f334b4010..2b8355e6b65f 100644
--- a/drivers/thunderbolt/usb4.c
+++ b/drivers/thunderbolt/usb4.c
@@ -1368,7 +1368,7 @@ static unsigned int usb3_bw_to_mbps(u32 bw, u8 scale)
{
unsigned long uframes;
- uframes = bw * 512 << scale;
+ uframes = bw * 512UL << scale;
return DIV_ROUND_CLOSEST(uframes * 8000, 1000 * 1000);
}
@@ -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 */
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,