From nobody Wed May 28 10:43:48 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6mMB3BZ1z5xJHW; Wed, 28 May 2025 10:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6mM86ZGPz3k48; Wed, 28 May 2025 10:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJOqho4bJix33hp0XE9eRu9qEjIGsvuBYJ4AFrq3K9A=; b=rqkGJHUrrgDpnG8j01vJ+XekKW8fC61V+Qt/lxmdTtCr5fxaY0w14oLG9qe0w/pdCE0ypd hT30zQUhoQNC29Ymy9F6JOsx3DV9AjeW5c5Pg+hHH42yALjo9RfHOCT7bT3SSK1bMxX4k+ zOc46BDB+EtfQysnAEDfC5pFTUDSWousLeogl/mucgME0EZMz4i2mKklO/Xi9je/8EsBQj /lcdVIxdChtShuFFk87jUNs+JsugLKkERTPpIs+d7fy5NnIIIHk2lyxMMfzgdFFwMdkC2t RPEItenZObEVkAaQ73qWz0f7jddTMHcHIurk7iPH5vmvp4pCuZsi6c7hTwm1PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748429029; a=rsa-sha256; cv=none; b=KgA5Ss4JVXGhRQCpxyig1gGbbGUx8v8WQi+CmA1jcY5O0U+enj8do5J0eMmLWEUDkMS0lU 2rI/fb+8MOFQ4imZEvjKyEg5tqnP/vQz+/ZxiuUKV1zqfRU+438MSyZNJlAxR12Fuc5zVk wTV8J2UuN2LWhfSvUU4ynQsJkwHbvX9AFbBjq25baN4G85bHg+8QMRc23VyUx30yjexD5/ NZNXV22UM/Jx4koLzuwK0mxJG5+VkjDJYvHKDn2f+UuT2/KwgdHvCaBaRbiARNtItwJ5e/ FQStAsKuVxdefAIyLL3AvFSMabMsGq5hatXLRFKuEHKXQOGvVJncntNY9tgL2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748429029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJOqho4bJix33hp0XE9eRu9qEjIGsvuBYJ4AFrq3K9A=; b=iPuKkTD3hYR+lL40ZP+t2tXAEQZKLwBC+EnsYgai9QUIN1hHzOsuBgeGCOPND4gauHdM2s rYOwaB72f+dbEyMgTh0ddehbk+D4Mu8REEvmVA02jOqIhRbWNHevccYLyVKWOBLbEITKrh rzZdEN0rhUp5Hi8mb8TsAoCVAjP4XA18L5tQ1q0ihgLJKgP+pm/8X8OEZb1O8/9RnDf6zo unDXvY9Jx13fJHCpGV+Ts9OFgSvl8eNvL7Yj1NTEUtDrcAkg1bOFaqMsjw9q5EIMWO8bRe Qq7RRFuxCIlHNF7keB4NNt412MUjnR8rKrKlF0Wby6E+rkXxBYTUOJ+dbI+AEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6mM82XglzbTw; Wed, 28 May 2025 10:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54SAhmLN098772; Wed, 28 May 2025 10:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SAhmBe098769; Wed, 28 May 2025 10:43:48 GMT (envelope-from git) Date: Wed, 28 May 2025 10:43:48 GMT Message-Id: <202505281043.54SAhmBe098769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 32af70fae827 - main - net80211: make sure to not start a BGSCAN if not enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32af70fae827ecab34e995b49ea7656ea6e70608 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=32af70fae827ecab34e995b49ea7656ea6e70608 commit 32af70fae827ecab34e995b49ea7656ea6e70608 Author: Bjoern A. Zeeb AuthorDate: 2025-05-24 17:01:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-28 10:42:58 +0000 net80211: make sure to not start a BGSCAN if not enabled On drivers not supporting background scanning (not having announced IEEE80211_C_BGSCAN) we repeatedly have seen scanning issues and BGSCAN was "on" according to, e.g., ddb show com /a. Turns out there are multiple problems: (a) the ioctl scanreq code can pass IEEE80211_[IOC_]SCAN_BGSCAN in (ifconfig wlanX scan will do so by default). That flag ends up on flags in the scanning code which have no other checks, and we are doing a BGSCAN. So make sure BGSCAN is announced by the driver and enabled (and it's STA mode for the full check) or filter the BGSCAN out. (b) ieee80211_bg_scan() never checked if background scanning was available/enabled. Do so now. (c) ieee80211_swscan_start_scan_locked() as a consequence of (a) would start the BGSCAN unconditionally. Also check for BGSCAN to be available/enabled here. Lastly, we should no longer reach ieee80211_swscan_bg_scan() without background scanning being available/enabled, so document that fact by placing a KASSERT. That will also help in case future changes will open a new hole or there are further which I have not noticed. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50513 --- sys/net80211/ieee80211_ioctl.c | 12 ++++++++++++ sys/net80211/ieee80211_scan.c | 13 +++++++++++++ sys/net80211/ieee80211_scan_sw.c | 8 +++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index a72568e559aa..85d46c018d36 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -2598,6 +2598,18 @@ ieee80211_scanreq(struct ieee80211vap *vap, struct ieee80211_scan_req *sr) return EINVAL; /* cleanse flags just in case, could reject if invalid flags */ sr->sr_flags &= IEEE80211_IOC_SCAN_FLAGS; + + /* + * If the driver does not support BGSCAN, or BGSCAN is disabled + * do not allow the IEEE80211_SCAN_BGSCAN flag to go through + * to avoid accidentally enabling BGSCANs. + * Also if not STA mode [see ieee80211_vap_setup()]. + */ + if ((vap->iv_caps & IEEE80211_C_BGSCAN) == 0 || + (vap->iv_flags & IEEE80211_F_BGSCAN) == 0 || + vap->iv_opmode != IEEE80211_M_STA) + sr->sr_flags &= ~IEEE80211_IOC_SCAN_BGSCAN; + /* * Add an implicit NOPICK if the vap is not marked UP. This * allows applications to scan without joining a bss (or picking diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c index 02cad610ee8e..f77baac1b134 100644 --- a/sys/net80211/ieee80211_scan.c +++ b/sys/net80211/ieee80211_scan.c @@ -428,6 +428,19 @@ ieee80211_bg_scan(struct ieee80211vap *vap, int flags) // IEEE80211_UNLOCK_ASSERT(sc); + /* + * If the driver has not announced BGSCAN capabilities + * or BGSCAN is disabled do not attempt to start a bg_scan. + * IEEE80211_F_BGSCAN only gets set if IEEE80211_C_BGSCAN + * was set by the driver, so no need to check for both here. + */ + if ((vap->iv_flags & IEEE80211_F_BGSCAN) == 0) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: BGSCAN not enabled; not starting bg_scan\n", + __func__); + return (0); + } + scan = ieee80211_scanner_get(vap->iv_opmode); if (scan == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, diff --git a/sys/net80211/ieee80211_scan_sw.c b/sys/net80211/ieee80211_scan_sw.c index f64730ce852f..d5770ff41968 100644 --- a/sys/net80211/ieee80211_scan_sw.c +++ b/sys/net80211/ieee80211_scan_sw.c @@ -201,7 +201,9 @@ ieee80211_swscan_start_scan_locked(const struct ieee80211_scanner *scan, vap->iv_stats.is_scan_passive++; if (flags & IEEE80211_SCAN_FLUSH) ss->ss_ops->scan_flush(ss); - if (flags & IEEE80211_SCAN_BGSCAN) + /* Only BGSCAN if enabled and requested. */ + if ((vap->iv_flags & IEEE80211_F_BGSCAN) != 0 && + (flags & IEEE80211_SCAN_BGSCAN) != 0) ic->ic_flags_ext |= IEEE80211_FEXT_BGSCAN; /* Set duration for this particular scan */ @@ -339,6 +341,10 @@ ieee80211_swscan_bg_scan(const struct ieee80211_scanner *scan, // IEEE80211_UNLOCK_ASSERT(ic); IEEE80211_LOCK(ic); + KASSERT((vap->iv_flags & IEEE80211_F_BGSCAN) != 0, + ("%s: vap %p iv_flags %#010x no IEEE80211_F_BGSCAN set", + __func__, vap, vap->iv_flags)); + scanning = ic->ic_flags & IEEE80211_F_SCAN; if (!scanning) { u_int duration;