mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
mac80211: fix potential overflow when multiplying to u32 integers
[ Upstream commit6194f7e647
] 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:050ac52cbe
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
fef6f594ea
commit
5af224ab94
1 changed files with 1 additions and 1 deletions
|
@ -356,7 +356,7 @@ u32 airtime_link_metric_get(struct ieee80211_local *local,
|
||||||
*/
|
*/
|
||||||
tx_time = (device_constant + 10 * test_frame_len / rate);
|
tx_time = (device_constant + 10 * test_frame_len / rate);
|
||||||
estimated_retx = ((1 << (2 * ARITH_SHIFT)) / (s_unit - err));
|
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;
|
return (u32)result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue