]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: iwlwifi: mvm: fix scan request validation
authorAvraham Stern <avraham.stern@intel.com>
Wed, 9 Jul 2025 20:05:43 +0000 (23:05 +0300)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Thu, 10 Jul 2025 16:48:38 +0000 (19:48 +0300)
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
drivers/net/wireless/intel/iwlwifi/mvm/scan.c

index 5f30109ca18fae41d16d1e37865340e811b818c1..79660138ae976c0514cb154128879a6f96c94e30 100644 (file)
@@ -836,7 +836,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] <=