Commit 1b6b4ed0 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

wifi: cfg80211: Drop entries with invalid BSSIDs in RNR 



Ignore AP information for entries that include an invalid
BSSID in the TBTT information field, e.g., all zeros BSSIDs.

Fixes: c8cb5b85 ("nl80211/cfg80211: support 6 GHz scanning")
Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230424103224.5e65d04d1448.Ic10c8577ae4a85272c407106c9d0a2ecb5372743@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 20429444

net/wireless/scan.c

+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2008 Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2016	Intel Deutschland GmbH

 * Copyright (C) 2018-2022 Intel Corporation

 * Copyright (C) 2018-2023 Intel Corporation

 */

#include <linux/kernel.h>

#include <linux/slab.h>
@@ -540,6 +540,10 @@ static int cfg80211_parse_ap_info(struct cfg80211_colocated_ap *entry, 
	/* skip the TBTT offset */

	pos++;



	/* ignore entries with invalid BSSID */

	if (!is_valid_ether_addr(pos))

		return -EINVAL;



	memcpy(entry->bssid, pos, ETH_ALEN);

	pos += ETH_ALEN;