From nobody Fri Jan 16 19:40:26 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 4dt9Dq06Hdz6NlLG for ; Fri, 16 Jan 2026 19:40:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9Dp5PVZz3wTS for ; Fri, 16 Jan 2026 19:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592426; 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=JLcinGCffkm+G3zb810uGHYZ6uNuKoyIwi08PYFMNPM=; b=ndgPY+VTzbPSMt8n+W3oryBkLqnuDbwSUgOThJPvPOrG58SGl1vWyAStQFWF2X6TzMtn3H KI0oy5Kr1HRquaKNpUYBkf9OP2KXjvEUMBl1D0+TFy1k/n3S6Rk52wA+GjukTVS/oQ3kPO 15Qoi86fwMEEO1aqZj8igXgchxR/ak3IVoWlLZPtfe0x7FMCfV/YwjTKHHrbq7JnZX+v+1 YytORacw51xxAyqciR98lVgd9K+7BidHUn3enWWgdkTtSa71syHkhIntnwVF8SU/MB3NnH kKYD6bPYrfoU2+qJnub4JiiBmgG5rw+Xyvve2ieAl1uvtCc/lGxZyi+qCu3G0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592426; 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=JLcinGCffkm+G3zb810uGHYZ6uNuKoyIwi08PYFMNPM=; b=po/Qwp1ld5PUzWHOAV2/b6ty3cMMimmoTGRhwLhVTxyIJQda3FlQ1Tdbc6foEgUUQmOwu1 GLysi1sx0yq4Jy+t58E4RJHMOw5ZAEMmgQdSxLC+nHjZshrfkb9t8jQEGYn9FB52jvj+iu hqHRhJ1xzkgwu16+TM1qzwD3HHymA/8558iveE9C3tRiPS9Yah2FbULyjsgpoM2nSx5+vG +8XYYZDvgiQcg3j8SMQsxACAOitHQB9lQ7idtQG4ZgspO9NiCEHAlvggZWPzNux8Gz+/Ur iBTtAQDu+ckVOy/FvM8mzkpVLhAdezvZeh3yxpptbpm0Cc/g9eJ1z+KruQkp0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592426; a=rsa-sha256; cv=none; b=IewJy9huf97CuAnN/39jCU4WkuuDLSgmOOQKXnb4zYCxK37ADuSB9gcY8/e4SnWlUXgIss KiBvBopa2Wr+WndRp7rhaK3IPtRmP450ZnKuFmrkSGiaZP6UupLXXP1imzfxv0fKd2Tkwg erTWsjdB0PQweeaGq0HvqeDh76IfjwH7TtEEFGeyY+3urAOz8dpZEofzXYAQaZUFZowaup CniY9TBmOiZemfCKWiLntXfKBfMt9x0FHxHzsDnnMOmw/JfKsO1vdRblXB6d2cAoke1kdL iB7onZ23XjR5qYjavsKGCnikXvIE+WG68Q7NC497Z3Ix6c9eLg54dKflwvs1hQ== 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 4dt9Dp4f8kzC48 for ; Fri, 16 Jan 2026 19:40:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c946 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 66e318513452 - stable/14 - linuxKPI: 802.11: assert wihpy lock in lkpi_80211_mo_start() 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 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/14 X-Git-Reftype: branch X-Git-Commit: 66e3185134528714f0017fe52f110b0cd9e94c19 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:26 +0000 Message-Id: <696a942a.c946.6262d2b3@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=66e3185134528714f0017fe52f110b0cd9e94c19 commit 66e3185134528714f0017fe52f110b0cd9e94c19 Author: Bjoern A. Zeeb AuthorDate: 2025-08-01 05:28:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:42 +0000 linuxKPI: 802.11: assert wihpy lock in lkpi_80211_mo_start() Newer versions of Linux wifi drivers assert the wiphy lock in the (*start)() path. Make sure we do too and do hold the wiphy lock. Sponsored by: The FreeBSD Foundation (cherry picked from commit 897cf423a39474096dc699f7b9d173e4a97d3510) --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++++ sys/compat/linuxkpi/common/src/linux_80211_macops.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index ae919b7c5809..d0d32fbe88d8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3826,8 +3826,10 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], IMPROVE(); + wiphy_lock(hw->wiphy); error = lkpi_80211_mo_start(hw); if (error != 0) { + wiphy_unlock(hw->wiphy); ic_printf(ic, "%s: failed to start hw: %d\n", __func__, error); mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); @@ -3837,11 +3839,13 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], error = lkpi_80211_mo_add_interface(hw, vif); if (error != 0) { IMPROVE(); /* XXX-BZ mo_stop()? */ + wiphy_unlock(hw->wiphy); ic_printf(ic, "%s: failed to add interface: %d\n", __func__, error); mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); return (NULL); } + wiphy_unlock(hw->wiphy); LKPI_80211_LHW_LVIF_LOCK(lhw); TAILQ_INSERT_TAIL(&lhw->lvif_head, lvif, lvif_entry); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index c5720142401d..d848da433e1d 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -54,6 +54,8 @@ lkpi_80211_mo_start(struct ieee80211_hw *hw) struct lkpi_hw *lhw; int error; + lockdep_assert_wiphy(hw->wiphy); + lhw = HW_TO_LHW(hw); if (lhw->ops->start == NULL) { error = EOPNOTSUPP;