Skip to content

Commit 60d6275

Browse files
Miriam-Racheljmberg-intel
authored andcommitted
wifi: iwlwifi: mvm: check n_ssids before accessing the ssids
In some versions of cfg80211, the ssids poinet might be a valid one even though n_ssids is 0. Accessing the pointer in this case will cuase an out-of-bound access. Fix this by checking n_ssids first. Fixes: c1a7515 ("iwlwifi: mvm: add adaptive dwell support") Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Reviewed-by: Ilan Peer <ilan.peer@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Link: https://msgid.link/20240513132416.6e4d1762bf0d.I5a0e6cc8f02050a766db704d15594c61fe583d45@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 989830d commit 60d6275

File tree

1 file changed

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

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,7 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm,
13131313
if (IWL_MVM_ADWELL_MAX_BUDGET)
13141314
cmd->v7.adwell_max_budget =
13151315
cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);
1316-
else if (params->ssids && params->ssids[0].ssid_len)
1316+
else if (params->n_ssids && params->ssids[0].ssid_len)
13171317
cmd->v7.adwell_max_budget =
13181318
cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);
13191319
else
@@ -1418,7 +1418,7 @@ iwl_mvm_scan_umac_dwell_v11(struct iwl_mvm *mvm,
14181418
if (IWL_MVM_ADWELL_MAX_BUDGET)
14191419
general_params->adwell_max_budget =
14201420
cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);
1421-
else if (params->ssids && params->ssids[0].ssid_len)
1421+
else if (params->n_ssids && params->ssids[0].ssid_len)
14221422
general_params->adwell_max_budget =
14231423
cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);
14241424
else

0 commit comments

Comments
 (0)