| From c44ea9fca9355c0e5f7bf0051fdd0de601051970 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 9 Jul 2025 23:05:43 +0300 |
| Subject: wifi: iwlwifi: mvm: fix scan request validation |
| |
| From: Avraham Stern <avraham.stern@intel.com> |
| |
| [ Upstream commit 7c2f3ec7707188d8d5269ae2dce97d7be3e9f261 ] |
| |
| The scan request validation function uses bitwise and instead |
| of logical and. Fix it. |
| |
| Signed-off-by: Avraham Stern <avraham.stern@intel.com> |
| Reviewed-by: Ilan Peer <ilan.peer@intel.com> |
| Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> |
| Link: https://patch.msgid.link/20250709230308.3fbc1f27871b.I7a8ee91f463c1a2d9d8561c8232e196885d02c43@changeid |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c |
| index 2a4c59c71448..1d9798775f8a 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c |
| @@ -822,7 +822,7 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids, |
| int n_channels) |
| { |
| return ((n_ssids <= PROBE_OPTION_MAX) && |
| - (n_channels <= mvm->fw->ucode_capa.n_scan_channels) & |
| + (n_channels <= mvm->fw->ucode_capa.n_scan_channels) && |
| (ies->common_ie_len + |
| ies->len[NL80211_BAND_2GHZ] + ies->len[NL80211_BAND_5GHZ] + |
| ies->len[NL80211_BAND_6GHZ] <= |
| -- |
| 2.39.5 |
| |
