From patchwork Mon Apr 24 07:32:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Greenman, Gregory" X-Patchwork-Id: 676791 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25839C77B61 for ; Mon, 24 Apr 2023 07:33:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229641AbjDXHdh (ORCPT ); Mon, 24 Apr 2023 03:33:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbjDXHdg (ORCPT ); Mon, 24 Apr 2023 03:33:36 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2D29E6C for ; Mon, 24 Apr 2023 00:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682321604; x=1713857604; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=eUSQAa9Njfa1cb+oZo0gO6rc+BBWy9j3tC9W/CNRj+I=; b=SRn/h/m4cjBrU+yFx/1O+5Uw8OFHrg91k9DG1eT+N7rpEB3fuYnJ8rfW fVfFvLyy7DD35r4Cb93sMv6M8/8RTPfpghaYJim72t7jFe9Sb6qUdJ8Bc VlhtVH6ODpNCypivO7wB9+G0o88BB7QZx1LekIWUByfP2DHsB63+I9pdk TaqvPnfyDa6UEv8/IlY5kwtlkv8kKUDF5T05oI5osaqRb3d6itbm2Qhms TmczodAperaJtMimos5zm1OvKV/QoeoUv28BYNNvEpz78wj6BsN7+joUk cJzHf/jRyWY+6IGMRVIghZ19yObffojFt/hoUMNwl8UAxGvhWbiLqTJVe g==; X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="326703988" X-IronPort-AV: E=Sophos;i="5.99,222,1677571200"; d="scan'208";a="326703988" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2023 00:33:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="643263145" X-IronPort-AV: E=Sophos;i="5.99,222,1677571200"; d="scan'208";a="643263145" Received: from ynever-mobl.ger.corp.intel.com (HELO ggreenma-mobl2.lan) ([10.214.234.99]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2023 00:33:22 -0700 From: gregory.greenman@intel.com To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Ilan Peer , Gregory Greenman Subject: [PATCH] wifi: cfg80211: Drop entries with invalid BSSIDs in RNR Date: Mon, 24 Apr 2023 10:32:24 +0300 Message-Id: <20230424103224.5e65d04d1448.Ic10c8577ae4a85272c407106c9d0a2ecb5372743@changeid> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ilan Peer Ignore AP information for entries that include an invalid BSSID in the TBTT information field, e.g., all zeros BSSIDs. Fixes: c8cb5b854b40 ("nl80211/cfg80211: support 6 GHz scanning") Signed-off-by: Ilan Peer Signed-off-by: Gregory Greenman --- net/wireless/scan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index a1382255fab3..c501db7bbdb3 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -5,7 +5,7 @@ * Copyright 2008 Johannes Berg * 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 #include @@ -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;