From nobody Thu Sep 10 09:48:37 2026 X-Original-To: dev-commits-src-branches@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 4hgXtZ5T1Cz6rm80 for ; Thu, 10 Sep 2026 09:48:38 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hgXtY6FjCz4b0L for ; Thu, 10 Sep 2026 09:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789033717; 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=qiaQzx9Ejvlj097fVOpvoqNNob6a+OS3nZna06YsmhE=; b=yRGFNy62NR8BkhrTJuTcMC/UHvGw8lLX4OnEwDLk18ovgZ3kAZ3s6bTx/DpwAmMUK1/UHB Fv/ch1zBYLu0u5VGfp0zk8YzIzwHuXANXFh1JPcKfQL03bPHbfBE9DrNbMjgnwKlkFvySN +jSv0SmctMiKcdvvUh0SCSx+cg12YlBR1lsnMAIS3qwdZC+PVjv3PeRifIBPQUFSkJAtDX As6V+18fIreblqHWHlFYAAssPayBATjRQXbkhI3uW3uFp52Y5ATJ4Ff2SAsDS53oNerP4G WF6tK6ad6WuB9pnxFRCDHMSIRuMp0T1qsV7wMWteCNamEWHamjxoYy482Ecb8w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789033717; b=ZHtgdcL/SW8byLom5XJF/ksdJQ8qO7mmoCr60Rv/4/oMk7ev/8hsoKqPZf0QVOLOQXE7iY 2i9rxhmoogHUMm0YDvwmV9Y/OZKMgS7DYQizzFGSObKzjcdsC/agrrIqHTcxvzRZ5rMTvk No0R/60TYXc42NUD1kJii2nLdQ4fpUo0X1S5P/7uc6Es+c1IUUsMmTIWrenXc6VV4XyhKo I7oOufWiDLEHZelXTb5ox+GIecuoHxbCTo1QFluvCwAOnwkiG7WCox2FGTfDHg5rDawudx lTn+smElnnrvFdT2RIuxhrkXjg0YP5pOdJH7MRyFEx5nABTBDASct3vTv3pgIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789033717; 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=qiaQzx9Ejvlj097fVOpvoqNNob6a+OS3nZna06YsmhE=; b=VjAftW4aDB9se3z4XxKrujB6H85U9ap2uL/EWw4QDE5N7HO3WWwEBShC3kQCyd5uqaDKSu wt6+FqB4EHzaZx4JIVrCxo3rlsAljG6INEq/BWgG9Kp/gZGLID8eW7Ai6YdqKvXWefkr2e Ts881/9aF7O389aXWFOtDpsF6J/k8WlzF/gCGn9wPbhYTwKOifHYv0FEGARyYZGq2o6YXp H/JOK6qaIKYRORlXkVy3Ng4ppe1mfzo1+ES1YSh+eDXXbVMfKvIQYal8o7Ffd6MhKKYEec 613qzd3ymQUmv4jPzNqqX7oWDoG5lUNYBFzsu6GayPEro/uKYEi43FwVKNvINA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hgXtY5KW5zM37 for ; Thu, 10 Sep 2026 09:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 264a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 10 Sep 2026 09:48:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d322892cef16 - stable/15 - LinuxKPI: 802.11: assert wiphy lock for lkpi_bss_info_change() and MO List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: d322892cef16d042aacf45ec5c1351f07390790f Auto-Submitted: auto-generated Date: Thu, 10 Sep 2026 09:48:37 +0000 Message-Id: <6aa27cf5.264a6.18746c45@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d322892cef16d042aacf45ec5c1351f07390790f commit d322892cef16d042aacf45ec5c1351f07390790f Author: Bjoern A. Zeeb AuthorDate: 2026-08-21 14:02:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-10 09:46:53 +0000 LinuxKPI: 802.11: assert wiphy lock for lkpi_bss_info_change() and MO Finish reviewing all callers for lkpi_80211_mo_link_info_changed() and lkpi_80211_mo_bss_info_changed(), which are called from lkpi_bss_info_change() only. Add the lockdep_assert_wiphy() to lkpi_bss_info_change() and make sure all callers are holding the wiphy lock. PR: 297228 Sponsored by: The FreeBSD Foundation (cherry picked from commit d1057074b277443e11b04e8513acdf43fd133123) --- sys/compat/linuxkpi/common/src/linux_80211.c | 7 ++++++- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 7f9bb9459c6a..d8b5b631efd8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2713,6 +2713,8 @@ lkpi_bss_info_change(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct lkpi_vif *lvif; enum ieee80211_bss_changed vif_cfg_bits, link_info_bits; + lockdep_assert_wiphy(hw->wiphy); + if (ieee80211_vif_is_mld(vif)) { TODO("This likely needs a subset only; split up into 3 parts."); } @@ -4232,8 +4234,10 @@ lkpi_iv_sta_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0, * If this direct call to mo_bss_info_changed will not work due to * locking, see if queue_work() is fast enough. */ + wiphy_lock(hw->wiphy); bss_changed = lkpi_update_dtim_tsf(vif, ni, ni->ni_vap, __func__, __LINE__); lkpi_bss_info_change(hw, vif, bss_changed); + wiphy_unlock(hw->wiphy); } /* @@ -4453,13 +4457,14 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], TAILQ_INSERT_TAIL(&lhw->lvif_head, lvif, lvif_entry); LKPI_80211_LHW_LVIF_UNLOCK(lhw); + wiphy_lock(hw->wiphy); + /* Set bss_info. */ bss_changed = 0; lkpi_bss_info_change(hw, vif, bss_changed); /* Configure tx queues (conf_tx), default WME & send BSS_CHANGED_QOS. */ IMPROVE("Hardcoded values; to fix see 802.11-2016, 9.4.2.29 EDCA Parameter Set element"); - wiphy_lock(hw->wiphy); for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { bzero(&txqp, sizeof(txqp)); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 09199862dfb7..06d2ecba8048 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -602,7 +602,7 @@ lkpi_80211_mo_link_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *v struct lkpi_hw *lhw; might_sleep(); - /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + lockdep_assert_wiphy(hw->wiphy); lhw = HW_TO_LHW(hw); if (lhw->ops->link_info_changed == NULL && @@ -634,7 +634,7 @@ lkpi_80211_mo_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vi { struct lkpi_hw *lhw; - /* XXX-FINISH all callers for lockdep_assert_wiphy(hw->wiphy); */ + lockdep_assert_wiphy(hw->wiphy); lhw = HW_TO_LHW(hw); if (lhw->ops->bss_info_changed == NULL)