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 ACD96156F37; Tue, 23 Jul 2024 18:26:06 +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=1721759166; cv=none; b=l9idFpTD/OqnFl5pip8cZ2bj/83N1bk9hhXUYhd2BoOeSAzbRJIUiqcJAcwrvTY85n7WvFOwSgi+8wd+wfIda+WoQQI4vsj9kxiF79GTb0BAkSEuGkguaroIMXCUgVLSw1nIo6mip1a593fBQE7kOQ89xqUQ8PrQDTJeoiWFfF4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759166; c=relaxed/simple; bh=FfgH9lrEWvgUobGg7wgIVxkOLNirKCgEqQ+AIjUa6PQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ib3MPNZWUhEdmkOCSgEXGkgvYJVu5pAtCE007V9BsDwFaubJ0DJudyA/2H306zzotaiJ/uuO6g/SxYo1jRhzXWMOvMAPIRt8ZDsNlIXS7Zo9Uj3ZEkFbSn0exBOGZ57Evw5mjQr0iYiDhkppHGMNzHPVwmsKwPk8xnFilOn81F0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gli1VvRR; 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="gli1VvRR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F4A3C4AF09; Tue, 23 Jul 2024 18:26:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759166; bh=FfgH9lrEWvgUobGg7wgIVxkOLNirKCgEqQ+AIjUa6PQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gli1VvRRUBeBxJMzw3epW+kI0fFbmuuZesdHqa44VHOKitouOGY3QkslMWx+4M1Cm Ui7ADMWArez1UfTmqVugrLVPS1lP21LGXMm3tFOvPvmcLa2IReM9V3MO5hjWJhWfO1 vkuSDENKlRSptaQ3Ke5UgfYaCJYibJexD8H/9IBE= 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.1 024/105] wifi: iwlwifi: mvm: properly set 6 GHz channel direct probe option Date: Tue, 23 Jul 2024 20:23:01 +0200 Message-ID: <20240723180403.956363271@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180402.490567226@linuxfoundation.org> References: <20240723180402.490567226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 a7a29f1659ea6..838ab08e68c6b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1707,7 +1707,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