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 5751014C5B0; Tue, 23 Jul 2024 18:31:02 +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=1721759462; cv=none; b=D6kQqhxJ4alnUwBddsQ1NnX+tLUkoVnqy8VdXuahJyFLEcPe5xew7Mvg+jzWp3HAGgpvG9jLuf9LBXWATsjmaVNmVqBu9F7N5QQA90Itw8oT6ksixxuYblU129EBx+zLinsbyukJVq+w9WCd6oMjAnc0Xi8BlZJqrcGSJ1zb868= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759462; c=relaxed/simple; bh=sQ1bmz8gqFuljWGJB/JaBB81BT9ayPbLaeyaTae4KfM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WyqjO/sUsANCzpnsxxVfEcQ53GSzRSEQJNxXAXoAZYMfIN/b0YkSQT8uQSLJBtOiquA1pO8gPFTDSW6m40PA6hZi831gcEMnkuW+aEAsfYZi6/CH3qkDfgHaOXha7YAZW0GoegY2i/3UV41kcP+FrgLcr3ZSqy9QSBeYEDmTGDE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=O/6KBVJf; 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="O/6KBVJf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1F96C4AF09; Tue, 23 Jul 2024 18:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759462; bh=sQ1bmz8gqFuljWGJB/JaBB81BT9ayPbLaeyaTae4KfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O/6KBVJf6Ni+lSLf8gF4fvCIIunNRUuML0GXFJ22dfvxjDmYG12ZebfqpEdgCAU3N 4/khXeE4fPjnDF3TTLCops6X/IBbzW7+a/Wt5hc0fFV7vBHGRl2vlbpqXesNin2Pen iSNksnOX4lbyq7HlSkxF//8vlCTMmPnY4TdwV4tg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ayala Beker , Ilan Peer , Miri Korenblit , Johannes Berg , Sasha Levin Subject: [PATCH 6.6 019/129] wifi: iwlwifi: mvm: properly set 6 GHz channel direct probe option Date: Tue, 23 Jul 2024 20:22:47 +0200 Message-ID: <20240723180405.528348297@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180404.759900207@linuxfoundation.org> References: <20240723180404.759900207@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: Ayala Beker [ Upstream commit 989830d1cf16bd149bf0690d889a9caef95fb5b1 ] Ensure that the 6 GHz channel is configured with a valid direct BSSID, avoiding any invalid or multicast BSSID addresses. Signed-off-by: Ayala Beker Reviewed-by: Ilan Peer Signed-off-by: Miri Korenblit Link: https://msgid.link/20240513132416.91a631a0fe60.I2ea2616af9b8a2eaf959b156c69cf65a2f1204d4@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c index 0841f1d6dc475..150beeb9df117 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1718,7 +1718,10 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm, break; } - if (k == idex_b && idex_b < SCAN_BSSID_MAX_SIZE) { + if (k == idex_b && idex_b < SCAN_BSSID_MAX_SIZE && + !WARN_ONCE(!is_valid_ether_addr(scan_6ghz_params[j].bssid), + "scan: invalid BSSID at index %u, index_b=%u\n", + j, idex_b)) { memcpy(&pp->bssid_array[idex_b++], scan_6ghz_params[j].bssid, ETH_ALEN); } -- 2.43.0