diff options
| author | Colin Ian King <colin.king@canonical.com> | 2021-02-05 20:53:52 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2021-02-12 10:54:42 +0300 |
| commit | 6194f7e6473be78acdc5d03edd116944bdbb2c4e (patch) | |
| tree | b2b0fca5c713d41010dc26a4c7590160c4c1fd11 | |
| parent | 10cb8e617560fc050a759a897a2dde07a5fe04cb (diff) | |
| download | linux-6194f7e6473be78acdc5d03edd116944bdbb2c4e.tar.xz | |
mac80211: fix potential overflow when multiplying to u32 integers
The multiplication of the u32 variables tx_time and estimated_retx is
performed using a 32 bit multiplication and the result is stored in
a u64 result. This has a potential u32 overflow issue, so avoid this
by casting tx_time to a u64 to force a 64 bit multiply.
Addresses-Coverity: ("Unintentional integer overflow")
Fixes: 050ac52cbe1f ("mac80211: code for on-demand Hybrid Wireless Mesh Protocol")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20210205175352.208841-1-colin.king@canonical.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/mesh_hwmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 313eee12410e..3db514c4c63a 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -356,7 +356,7 @@ u32 airtime_link_metric_get(struct ieee80211_local *local, */ tx_time = (device_constant + 10 * test_frame_len / rate); estimated_retx = ((1 << (2 * ARITH_SHIFT)) / (s_unit - err)); - result = (tx_time * estimated_retx) >> (2 * ARITH_SHIFT); + result = ((u64)tx_time * estimated_retx) >> (2 * ARITH_SHIFT); return (u32)result; } |