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 E0302126BE9; Tue, 3 Sep 2024 20:42:45 +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=1725396166; cv=none; b=O87rvkYujl+hiYOpO5uToBdTagVV1k8nw8uMV3NBmHfCV/hC5mqp0XJKEK6iUoJCVxXlGF0+R6XrPOZaLHa9YN7BvBh9umzMNtsMrEl/rDnqa51Xs62me6WitkI25ACzSlbbSkqAinOnWxivjvThVp9/uHd+XnpRHjHhUoEEVvk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725396166; c=relaxed/simple; bh=ShLy025sjlB6WthLRhuFn5KsnMkPMWNPh/+sZlatCU8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NFyVLYlYXPB7KQjtug+4wO2BocwQJ2lArxWSQgqcUKdOYnw1w39s/DAs9JDaLsyxVDohIgIvsOh9n7ESFaeCt/AIJoF6lL4RdIsOrmriYdep/mt18AAoZwfZ9KFJODhTq6cGB1UeOhYMU6pBHMou75cD07WFXfoOkEUAimhlJww= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j+zZe9Ut; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="j+zZe9Ut" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FE69C4CEC5; Tue, 3 Sep 2024 20:42:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725396165; bh=ShLy025sjlB6WthLRhuFn5KsnMkPMWNPh/+sZlatCU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j+zZe9UtoBmRHYKUSb7Y2BrLI3A3BuUMwIHJ2eaZqqMssnA1AxWxQEG2EIe/qQRjR TQ7nr18b8suQjI8c27eFc36RHUxkogqgFnViaWat8I5KePiZDJwCJEtdhkGjKBP/pO jmA7NUg06/LCFZ3IQRnQbbRcwEPxe0oid7xTAeIuOZFQshwTXftuPuKhfp3Cy+Ob2l qgcNDsKbLLCI8Nf0Db4DTdle0VtlSBauh1Hlg/nKacjilljNHW9SR1Z/4g86jfAa5C GE6oG0rsUSsiw2PK6WmgiS9RSER13UPL5zvLqUZLStIPfAunBRe69gRyGzujTQFqat 9hg1ed+idcRSQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Gabay , Ilan Peer , Miri Korenblit , Johannes Berg , Sasha Levin , kvalo@kernel.org, ayala.beker@intel.com, benjamin.berg@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 17/22] wifi: iwlwifi: mvm: fix iwl_mvm_scan_fits() calculation Date: Tue, 3 Sep 2024 15:22:04 -0400 Message-ID: <20240903192243.1107016-17-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903192243.1107016-1-sashal@kernel.org> References: <20240903192243.1107016-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.7 Content-Transfer-Encoding: 8bit From: Daniel Gabay [ Upstream commit d44162280899c3fc2c6700e21e491e71c3c96e3d ] The calculation should consider also the 6GHz IE's len, fix that. In addition, in iwl_mvm_sched_scan_start() the scan_fits helper is called only in case non_psc_incldued is true, but it should be called regardless, fix that as well. Signed-off-by: Daniel Gabay Reviewed-by: Ilan Peer Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20240825191257.7db825442fd2.I99f4d6587709de02072fd57957ec7472331c6b1d@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index e975f5ff17b5d..4f04df509029e 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -837,8 +837,8 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids, return ((n_ssids <= PROBE_OPTION_MAX) && (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_2GHZ] + ies->len[NL80211_BAND_5GHZ] + + ies->len[NL80211_BAND_6GHZ] <= iwl_mvm_max_scan_ie_fw_cmd_room(mvm))); } @@ -3168,18 +3168,16 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm, params.n_channels = j; } - if (non_psc_included && - !iwl_mvm_scan_fits(mvm, req->n_ssids, ies, params.n_channels)) { - kfree(params.channels); - return -ENOBUFS; + if (!iwl_mvm_scan_fits(mvm, req->n_ssids, ies, params.n_channels)) { + ret = -ENOBUFS; + goto out; } uid = iwl_mvm_build_scan_cmd(mvm, vif, &hcmd, ¶ms, type); - - if (non_psc_included) - kfree(params.channels); - if (uid < 0) - return uid; + if (uid < 0) { + ret = uid; + goto out; + } ret = iwl_mvm_send_cmd(mvm, &hcmd); if (!ret) { @@ -3197,6 +3195,9 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm, mvm->sched_scan_pass_all = SCHED_SCAN_PASS_ALL_DISABLED; } +out: + if (non_psc_included) + kfree(params.channels); return ret; } -- 2.43.0