From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F24CA1FBF43; Wed, 6 Nov 2024 12:55:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897706; cv=none; b=YxAU6vTmlZ0AmawbQZLhPWvYEe1SWMDAoqIGmhIVuPPy1fS/euSIk0+DzZK9MNVKQOqZjbrOb9NEtJMgGTM58G4giCrTipwlpSkUy2U2wgBhekqfqg3E873qM6N65gaXbwVqLCFS9zRjSs2lZv0Q8DF7Laz6TO4LLOsr4tpw/I0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897706; c=relaxed/simple; bh=zuzmsxsFQUXPgqzvl08ARRvRzvW8QFDrvnMdL9GgA6U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nTDWgx4zSSNxMQuvwCsEHauIv7A3HpmnqEcFw3sWYE1teYF1zQhU0dfX6ikoNJPDRzXmbaicbf/R4pIC4zUN31B3dJg0A32ueneRsqXSH2abzq6l7NDsE/p8f36xcFB94NtjS02ffvenMd6slkMz8i1h4wYgT182EIE9BTjRjhk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FMPuymJU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FMPuymJU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EEE3C4CECD; Wed, 6 Nov 2024 12:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730897705; bh=zuzmsxsFQUXPgqzvl08ARRvRzvW8QFDrvnMdL9GgA6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FMPuymJUtfTbYOz423trzQNoXJq33TlkO+mLMlLHL0LvzSK3ZYrW11phPJSEYNXuk R6EhV8r1/g2WUzCAx69TbGKdcD+WRlUwZs0Cv8gh02tpn9fxTzzZ53op29/iGHPNwZ d3WOd45uhTi2tJDT8+66/tSUEN9Ch/2aLV+ldoSQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Berg Subject: [PATCH 6.6 142/151] wifi: iwlwifi: mvm: fix 6 GHz scan construction Date: Wed, 6 Nov 2024 13:05:30 +0100 Message-ID: <20241106120312.757882058@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120308.841299741@linuxfoundation.org> References: <20241106120308.841299741@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg commit 7245012f0f496162dd95d888ed2ceb5a35170f1a upstream. If more than 255 colocated APs exist for the set of all APs found during 2.4/5 GHz scanning, then the 6 GHz scan construction will loop forever since the loop variable has type u8, which can never reach the number found when that's bigger than 255, and is stored in a u32 variable. Also move it into the loops to have a smaller scope. Using a u32 there is fine, we limit the number of APs in the scan list and each has a limit on the number of RNR entries due to the frame size. With a limit of 1000 scan results, a frame size upper bound of 4096 (really it's more like ~2300) and a TBTT entry size of at least 11, we get an upper bound for the number of ~372k, well in the bounds of a u32. Cc: stable@vger.kernel.org Fixes: eae94cf82d74 ("iwlwifi: mvm: add support for 6GHz") Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219375 Link: https://patch.msgid.link/20241023091744.f4baed5c08a1.I8b417148bbc8c5d11c101e1b8f5bf372e17bf2a7@changeid Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1751,7 +1751,8 @@ iwl_mvm_umac_scan_cfg_channels_v7_6g(str &cp->channel_config[ch_cnt]; u32 s_ssid_bitmap = 0, bssid_bitmap = 0, flags = 0; - u8 j, k, s_max = 0, b_max = 0, n_used_bssid_entries; + u8 k, s_max = 0, b_max = 0, n_used_bssid_entries; + u32 j; bool force_passive, found = false, allow_passive = true, unsolicited_probe_on_chan = false, psc_no_listen = false; s8 psd_20 = IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED;