Skip to content

Commit d415416

Browse files
committed
wifi: iwlwifi: mvm: check n_ssids before accessing the ssids
jira LE-1907 cve CVE-2024-40929 Rebuild_History Non-Buildable kernel-5.14.0-427.33.1.el9_4 commit-author Miri Korenblit <miriam.rachel.korenblit@intel.com> commit 60d6275 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> (cherry picked from commit 60d6275) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 8889c2f commit d415416

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
@@ -1304,7 +1304,7 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm,
13041304
if (IWL_MVM_ADWELL_MAX_BUDGET)
13051305
cmd->v7.adwell_max_budget =
13061306
cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);
1307-
else if (params->ssids && params->ssids[0].ssid_len)
1307+
else if (params->n_ssids && params->ssids[0].ssid_len)
13081308
cmd->v7.adwell_max_budget =
13091309
cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);
13101310
else
@@ -1406,7 +1406,7 @@ iwl_mvm_scan_umac_dwell_v11(struct iwl_mvm *mvm,
14061406
if (IWL_MVM_ADWELL_MAX_BUDGET)
14071407
general_params->adwell_max_budget =
14081408
cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);
1409-
else if (params->ssids && params->ssids[0].ssid_len)
1409+
else if (params->n_ssids && params->ssids[0].ssid_len)
14101410
general_params->adwell_max_budget =
14111411
cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);
14121412
else

0 commit comments

Comments
 (0)