Skip to content

Commit 8ba438e

Browse files
tititiou36jmberg-intel
authored andcommitted
wifi: iwlwifi: mvm: Fix a memory corruption issue
A few lines above, space is kzalloc()'ed for: sizeof(struct iwl_nvm_data) + sizeof(struct ieee80211_channel) + sizeof(struct ieee80211_rate) 'mvm->nvm_data' is a 'struct iwl_nvm_data', so it is fine. At the end of this structure, there is the 'channels' flex array. Each element is of type 'struct ieee80211_channel'. So only 1 element is allocated in this array. When doing: mvm->nvm_data->bands[0].channels = mvm->nvm_data->channels; We point at the first element of the 'channels' flex array. So this is fine. However, when doing: mvm->nvm_data->bands[0].bitrates = (void *)((u8 *)mvm->nvm_data->channels + 1); because of the "(u8 *)" cast, we add only 1 to the address of the beginning of the flex array. It is likely that we want point at the 'struct ieee80211_rate' allocated just after. Remove the spurious casting so that the pointer arithmetic works as expected. Fixes: 8ca151b ("iwlwifi: add the MVM driver") Signed-off-by: Christophe JAILLET <[email protected]> Acked-by: Gregory Greenman <[email protected]> Link: https://lore.kernel.org/r/23f0ec986ef1529055f4f93dcb3940a6cf8d9a94.1690143750.git.christophe.jaillet@wanadoo.fr Signed-off-by: Johannes Berg <[email protected]>
1 parent e8fbe99 commit 8ba438e

File tree

1 file changed

+1
-1
lines changed
  • drivers/net/wireless/intel/iwlwifi/mvm

1 file changed

+1
-1
lines changed

drivers/net/wireless/intel/iwlwifi/mvm/fw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mvm *mvm)
802802
mvm->nvm_data->bands[0].n_channels = 1;
803803
mvm->nvm_data->bands[0].n_bitrates = 1;
804804
mvm->nvm_data->bands[0].bitrates =
805-
(void *)((u8 *)mvm->nvm_data->channels + 1);
805+
(void *)(mvm->nvm_data->channels + 1);
806806
mvm->nvm_data->bands[0].bitrates->hw_value = 10;
807807
}
808808

0 commit comments

Comments
 (0)