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 C8FACF519; Thu, 25 Jul 2024 14:51:20 +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=1721919080; cv=none; b=fN6+u6TJ35D3xBzm77E0NEL+5OT015ssn/DecOLAM1QxuusUnoOVQrcj3a3OmmcSZKeFLmXKgfxwPMhEU8GmrV+6whXQmj1nk/kRX2abQiu+Z/ZO0K+/WtFtpR2sJmilUwT0Fa2GGZCZ1SKP6POdLllleDD5kgAIYA5JjZ8ZPh8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721919080; c=relaxed/simple; bh=Wj5IIBi5jn26YcB2C1eKtdLEf9YZOFjJUGNU2C5Y2y8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F+Nut0rDWUI15oucrQN0EmRu+hmzj2GRcDCkCxwERpaP2AKsVy+IoZogmwD3CwTIYZynKMH5mhf7ZDzEplg+59qyqK+XgQeo0rdyuGdHMgYzyc1GpuSyNLxdQu90aiQgJ3ZD65mhGeIFJasQOvQIiq8j0k24YcexqRqmpF8/KNk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kR6donLG; 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="kR6donLG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DAB5C116B1; Thu, 25 Jul 2024 14:51:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721919080; bh=Wj5IIBi5jn26YcB2C1eKtdLEf9YZOFjJUGNU2C5Y2y8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kR6donLGnY1nzJ2F5FxVZyTUyljc0883/NhDRAeNXrfJ1qaM88LrIxbzsn0DNqApu akAsVdhJPTAqqFV8zF08wbPLLtbGFS2UosMrkHqmXOsDnhzncIiPh7BElJAtzh2867 i2srg3z+2QBx7m/lkl9olIjz6BcctqVnGLo/+kVM= 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 5.15 18/87] wifi: iwlwifi: mvm: properly set 6 GHz channel direct probe option Date: Thu, 25 Jul 2024 16:36:51 +0200 Message-ID: <20240725142739.121071297@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240725142738.422724252@linuxfoundation.org> References: <20240725142738.422724252@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 5.15-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 0605363b62720..8179a7395bcaf 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c @@ -1721,7 +1721,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