wifi: iwlwifi: mvm: avoid baid size integer overflow
authorJohannes Berg <johannes.berg@intel.com>
Tue, 20 Jun 2023 10:04:02 +0000 (13:04 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 21 Jun 2023 12:02:16 +0000 (14:02 +0200)
Roee reported various hard-to-debug crashes with pings in
EHT aggregation scenarios. Enabling KASAN showed that we
access the BAID allocation out of bounds, and looking at
the code a bit shows that since the reorder buffer entry
(struct iwl_mvm_reorder_buf_entry) is 128 bytes if debug
such as lockdep is enabled, then staring from an agg size
512 we overflow the size calculation, and allocate a much
smaller structure than we should, causing slab corruption
once we initialize this.

Fix this by simply using u32 instead of u16.

Reported-by: Roee Goldfiner <roee.h.goldfiner@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230620125813.f428c856030d.I2c2bb808e945adb71bc15f5b2bac2d8957ea90eb@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/sta.c

index 37a52ff..3b9a343 100644 (file)
@@ -2885,7 +2885,7 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
        }
 
        if (iwl_mvm_has_new_rx_api(mvm) && start) {
-               u16 reorder_buf_size = buf_size * sizeof(baid_data->entries[0]);
+               u32 reorder_buf_size = buf_size * sizeof(baid_data->entries[0]);
 
                /* sparse doesn't like the __align() so don't check */
 #ifndef __CHECKER__