diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2020-05-01 15:10:16 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-04 11:57:21 -0700 |
| commit | 44d95cc6b10ff7439d45839c96c581cb4368c088 (patch) | |
| tree | 2bd48e1c658e69d2db09d0b4d20ddbfc85257544 | |
| parent | net_sched: fix tcm_parent in tc filter dump (diff) | |
| download | wireguard-linux-44d95cc6b10ff7439d45839c96c581cb4368c088.tar.xz wireguard-linux-44d95cc6b10ff7439d45839c96c581cb4368c088.zip | |
net: stmmac: gmac5+: fix potential integer overflow on 32 bit multiply
The multiplication of cfg->ctr[1] by 1000000000 is performed using a
32 bit multiplication (since cfg->ctr[1] is a u32) and this can lead
to a potential overflow. Fix this by making the constant a ULL to
ensure a 64 bit multiply occurs.
Fixes: 504723af0d85 ("net: stmmac: Add basic EST support for GMAC5+")
Addresses-Coverity: ("Unintentional integer overflow")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 494c859b4ade..67ba67ed0cb9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -624,7 +624,7 @@ int dwmac5_est_configure(void __iomem *ioaddr, struct stmmac_est *cfg, total_offset += offset; } - total_ctr = cfg->ctr[0] + cfg->ctr[1] * 1000000000; + total_ctr = cfg->ctr[0] + cfg->ctr[1] * 1000000000ULL; total_ctr += total_offset; ctr_low = do_div(total_ctr, 1000000000); |