| Message ID | 20211223073928.37371-1-xiaoliang.yang_1@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | eccffcf4657ab9a148faaa0eb354d2a091caf552 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: stmmac: ptp: fix potentially overflowing expression | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 23 Dec 2021 15:39:28 +0800 you wrote: > Convert the u32 variable to type u64 in a context where expression of > type u64 is required to avoid potential overflow. > > Fixes: e9e3720002f6 ("net: stmmac: ptp: update tas basetime after ptp adjust") > Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [net] net: stmmac: ptp: fix potentially overflowing expression https://git.kernel.org/netdev/net/c/eccffcf4657a You are awesome, thank you!
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 580cc035536b..be9b58b2abf9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c @@ -102,7 +102,7 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta) time.tv_nsec = priv->plat->est->btr_reserve[0]; time.tv_sec = priv->plat->est->btr_reserve[1]; basetime = timespec64_to_ktime(time); - cycle_time = priv->plat->est->ctr[1] * NSEC_PER_SEC + + cycle_time = (u64)priv->plat->est->ctr[1] * NSEC_PER_SEC + priv->plat->est->ctr[0]; time = stmmac_calc_tas_basetime(basetime, current_time_ns,
Convert the u32 variable to type u64 in a context where expression of type u64 is required to avoid potential overflow. Fixes: e9e3720002f6 ("net: stmmac: ptp: update tas basetime after ptp adjust") Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com> --- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)