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 359C214AD25; Wed, 19 Jun 2024 13:11:34 +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=1718802695; cv=none; b=TXCHqnK9iL6C1umvdn+AsPBDD720pHTQgrzGsmqT8HvfT+EEvkNTm83glD0aO3TdSJM/wJlpVNWUNFDJy44rD6ZJIPzGM2OZgeetUF2FnLffWx33N7PSM/yCMpRRVQWInUIWSuJAMypjqeZluvF2acN91A+eqT1J9gtzfEDjO2g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802695; c=relaxed/simple; bh=5OSM7eyLRY3Ll4a9SwPrPHLtfIecNNm5pJdWw0WuL+c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aTy5BqUlknGEI76IKn6cF+l0YjMi34bM0147RkYlAcBmDYg1g75EcNrfbmOs24eYuOh/opf3U5qQCq21fKmKrek4nQcrCFMWKJnNR9T7DmTNmXyUI0xdSRhLatvL+fi6EWC3rTo/PwBIxf8hKbERtZT55lv/b/ejO+7ezer6TYc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QhhuFVUC; 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="QhhuFVUC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59258C2BBFC; Wed, 19 Jun 2024 13:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718802694; bh=5OSM7eyLRY3Ll4a9SwPrPHLtfIecNNm5pJdWw0WuL+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QhhuFVUCT/JhDM8LnNmB8femgCPc3jUNpBTiReOUVKDojtXW/qjmfLtm2wEmRtZnj e2bIvsDoGM1Fpal96hSo2jXbDoPrhWOHbsbIr/A8G7uRxfeaIV1rmkEeeFPK/5Icv5 jUWjrnCZCNqVXwFbmFdj1G4yfLAQh8GPo+KWi0Gw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Miri Korenblit , Ilan Peer , Johannes Berg , Sasha Levin Subject: [PATCH 6.9 016/281] wifi: iwlwifi: mvm: check n_ssids before accessing the ssids Date: Wed, 19 Jun 2024 14:52:55 +0200 Message-ID: <20240619125610.472943634@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619125609.836313103@linuxfoundation.org> References: <20240619125609.836313103@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.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Miri Korenblit [ Upstream commit 60d62757df30b74bf397a2847a6db7385c6ee281 ] In some versions of cfg80211, the ssids poinet might be a valid one even though n_ssids is 0. Accessing the pointer in this case will cuase an out-of-bound access. Fix this by checking n_ssids first. Fixes: c1a7515393e4 ("iwlwifi: mvm: add adaptive dwell support") Signed-off-by: Miri Korenblit Reviewed-by: Ilan Peer Reviewed-by: Johannes Berg Link: https://msgid.link/20240513132416.6e4d1762bf0d.I5a0e6cc8f02050a766db704d15594c61fe583d45@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 22bc032cffc8b..525d8efcc1475 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1303,7 +1303,7 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm, if (IWL_MVM_ADWELL_MAX_BUDGET) cmd->v7.adwell_max_budget = cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET); - else if (params->ssids && params->ssids[0].ssid_len) + else if (params->n_ssids && params->ssids[0].ssid_len) cmd->v7.adwell_max_budget = cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN); else @@ -1405,7 +1405,7 @@ iwl_mvm_scan_umac_dwell_v11(struct iwl_mvm *mvm, if (IWL_MVM_ADWELL_MAX_BUDGET) general_params->adwell_max_budget = cpu_to_le16(IWL_MVM_ADWELL_MAX_BUDGET); - else if (params->ssids && params->ssids[0].ssid_len) + else if (params->n_ssids && params->ssids[0].ssid_len) general_params->adwell_max_budget = cpu_to_le16(IWL_SCAN_ADWELL_MAX_BUDGET_DIRECTED_SCAN); else -- 2.43.0