rtw88: fix shift of more than 32 bits of a integer
authorColin Ian King <colin.king@canonical.com>
Wed, 1 May 2019 14:19:45 +0000 (15:19 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 2 May 2019 14:58:15 +0000 (17:58 +0300)
Currently the shift of an integer value more than 32 bits can
occur when nss is more than 32.  Fix this by making the integer
constants unsigned long longs before shifting and bit-wise or'ing
with the u64 ra_mask to avoid the undefined shift behaviour.

Addresses-Coverity: ("Bad shift operation")
Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtw88/main.c

index 9893e5e297e348e1bdeb3764bd13a2752d14229c..6304082361a719242de8e9295f8f57df4e1f8e5a 100644 (file)
@@ -363,13 +363,13 @@ static u64 get_vht_ra_mask(struct ieee80211_sta *sta)
                vht_mcs_cap = mcs_map & 0x3;
                switch (vht_mcs_cap) {
                case 2: /* MCS9 */
-                       ra_mask |= 0x3ff << nss;
+                       ra_mask |= 0x3ffULL << nss;
                        break;
                case 1: /* MCS8 */
-                       ra_mask |= 0x1ff << nss;
+                       ra_mask |= 0x1ffULL << nss;
                        break;
                case 0: /* MCS7 */
-                       ra_mask |= 0x0ff << nss;
+                       ra_mask |= 0x0ffULL << nss;
                        break;
                default:
                        break;