Re: [PATCH] mac80211: ethtool: avoid 32 bit multiplication overflow

[Johannes Berg]

On Tue, 2018-05-08 at 13:57 +0100, Colin King wrote:
> From: Colin Ian King 
> 
> The multiplication of 10 * cfg80211_calculate_bitrate() is a 32 bit
> operation and can overflow if cfg80211_calculate_bitrate is greater
> than 42949. Although I don't believe this is occurring at present, it
> would be safer to avoid the potential overflow by making the constant
> 10 an ULL to ensure a 64 multiplication occurs.

Yeah it can't happen since mac80211 doesn't support 60 GHz devices, and
all others are limited to less than than.

Still, applied.

johannes

[PATCH] mac80211: ethtool: avoid 32 bit multiplication overflow

[Colin King]

From: Colin Ian King 

The multiplication of 10 * cfg80211_calculate_bitrate() is a 32 bit
operation and can overflow if cfg80211_calculate_bitrate is greater
than 42949. Although I don't believe this is occurring at present, it
would be safer to avoid the potential overflow by making the constant
10 an ULL to ensure a 64 multiplication occurs.

Detected by CoverityScan, CID#1468643 ("Unintentional integer overflow")

Signed-off-by: Colin Ian King 
---
 net/mac80211/ethtool.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/ethtool.c b/net/mac80211/ethtool.c
index 08408520c3f8..2ba5686cbcab 100644
--- a/net/mac80211/ethtool.c
+++ b/net/mac80211/ethtool.c
@@ -117,11 +117,11 @@ static void ieee80211_get_stats(struct net_device *dev,
 
 
if (sinfo.filled & BIT(NL80211_STA_INFO_TX_BITRATE))
-   data[i] = 10 *
+   data[i] = 10ULL *
cfg80211_calculate_bitrate();
i++;
if (sinfo.filled & BIT(NL80211_STA_INFO_RX_BITRATE))
-   data[i] = 10 *
+   data[i] = 10ULL *
cfg80211_calculate_bitrate();
i++;
 
-- 
2.17.0