Unverified Commit 1d5af92c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10117 wifi: iwlwifi: mvm: check n_ssids before accessing the ssids 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5YU3T7N2GQPHCCD72LFOYQEJAICKX23R/ 
 
https://gitee.com/src-openeuler/kernel/issues/IACZLE 
 
Link:https://gitee.com/openeuler/kernel/pulls/10117

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 3b509b4a b24c6fa1

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

+2 −2
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm, 
		if (IWL_MVM_ADWELL_MAX_BUDGET)

			cmd->v7.adwell_max_budget =

				cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);

		else if (params->ssids && params->ssids[0].ssid_len)

		else if (params->n_ssids && params->ssids[0].ssid_len)

			cmd->v7.adwell_max_budget =

				cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);

		else
@@ -1406,7 +1406,7 @@ iwl_mvm_scan_umac_dwell_v11(struct iwl_mvm *mvm, 
	if (IWL_MVM_ADWELL_MAX_BUDGET)

		general_params->adwell_max_budget =

			cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET);

	else if (params->ssids && params->ssids[0].ssid_len)

	else if (params->n_ssids && params->ssids[0].ssid_len)

		general_params->adwell_max_budget =

			cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN);

	else