]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: mld: fix scan request validation
authorAvraham Stern <avraham.stern@intel.com>
Thu, 10 Jul 2025 18:28:18 +0000 (21:28 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:41:09 +0000 (18:41 +0200)
[ Upstream commit d1f5f881ac2c5dc185a88c7bfe47d2b3ecbbc501 ]

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: Daniel Gabay <daniel.gabay@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/20250710212632.ec7d665f56a4.I416816b491fafa5d3efdf0a4be78356eedf2bd95@changeid
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/iwlwifi/mld/scan.c

index 3fce7cd2d512e843d4dc0ff4caec05ebf5893bd2..33e7e4d1ab9087f9dacbf2a25c051925d2cbaf27 100644 (file)
@@ -359,7 +359,7 @@ iwl_mld_scan_fits(struct iwl_mld *mld, int n_ssids,
                  struct ieee80211_scan_ies *ies, int n_channels)
 {
        return ((n_ssids <= PROBE_OPTION_MAX) &&
-               (n_channels <= mld->fw->ucode_capa.n_scan_channels) &
+               (n_channels <= mld->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] <=
                 iwl_mld_scan_max_template_size()));