]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:41:09 +0000 (18:41 +0200)
[ 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

index 60bd9c7e5f03d813e9183184338b2e714c421475..3dbda1e4a522b2a35e6cd6c874da3cf1e4c85188 100644 (file)
@@ -835,7 +835,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] <=