From nobody Fri Jan 16 19:40:27 2026 X-Original-To: dev-commits-src-all@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 4dt9Dr2MZ8z6NlTb for ; Fri, 16 Jan 2026 19:40:28 +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 4dt9Dq5VJPz3wWb for ; Fri, 16 Jan 2026 19:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592427; 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=Gi68wEe2J7UVvt5d6USxytAN2FHkSGc0qv0I9bQ/EMo=; b=k9DBI/0JJcDJ+1Dv8Etk8SyJY8kVNbkj/UoD+PumX8bOoVxb7fy5J+NadtlSThqYYdwtlK SRAkp9OjacbwixGXxogeRU+yaFHkvAZ5KSV4my9rsXnwaGziW9HYddYkiQFbhaUSA9XG9F S5GFcPCjBj/T4carewyz5I9TNxk3i7veGlswYPreOr1/4yOhfHbilpE38KoOBU3lm6gzB5 Uo3FzIJ5tmw891JNpNQjj60Hs/v3C+N2W4vp3UcHqx5RoCKFuF8g5WdPTxC8o+qCvEsqLX 1vcb8jpf2HO4T20V3UotJOpE4Nypc9q358qDfG77hqK05bsmuReklkuyKUpxfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592427; 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=Gi68wEe2J7UVvt5d6USxytAN2FHkSGc0qv0I9bQ/EMo=; b=Zmq0fZHq4EikVwMmQbkVrWwK88tc/E2PlY4ykSdvPNbRCrb03H8kARUWZ0cuU79TJ57oIx mnQIe87PQBCCAZ57DVuHjN/gMZTuQT268kMbrfMnyZfz1rG/44R2D8YTfG1FVP3zOcOL80 zygos7DU6Tcj5dKIHBcf3a0kp33u7AVJKu8xfQWrxkC6Bu0AaUMpdrfttbFz0SgeFDANBu 3hkMtG0J1yZl0+FfPVgvr1h2bx+GEnp1Dwhl2cYwpQxl16emOiLjWycMtSgLEctd+160t2 x89RUac7RbtieODLK8hBdNHJcR16l2KQjm2TUF3deTsJ7cjribmJy/1RYCbsMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592427; a=rsa-sha256; cv=none; b=hbZFhK8CwESLLiUA6a/w7wMNDACxgYHeo6ToqXUzrR+OjGZPEw9Wk+zyuqMA855DXcC6k/ Nxzlq8jH4xmTz5cLdvajP0GNEYpK/+t/4lng/+TQX81FYpl3yvEJ2AMS+IWpnaM+Bb8EES WCMN9NQm+IdWZ1biKSOKjP7nj4Z/CgKnG3rNrRwKEleXLUp74UNwS9ac23IQg/6VyTDd03 FL5SUaKhdFg0tQjFkTOdOWs2rahdX7V6jzXwHg8WphLJwYmq75KzaDt7mvsGJ5zkw164uR 25hfuhdptGbXxogYW5CibfhnkfnvP5FlU/taQCKJhnGWYhY5fK0GGbwr46JYbQ== 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 4dt9Dq53qGzBlM for ; Fri, 16 Jan 2026 19:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id c94a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4faad6c23983 - stable/14 - LinuxKPI: 802.11: add guards to lkpi_ic_ampdu_rx_{start,stop} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 4faad6c23983b564b0c832eaed059b65758e38b3 Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:27 +0000 Message-Id: <696a942b.c94a.7c80282d@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4faad6c23983b564b0c832eaed059b65758e38b3 commit 4faad6c23983b564b0c832eaed059b65758e38b3 Author: Bjoern A. Zeeb AuthorDate: 2025-07-20 15:03:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:42 +0000 LinuxKPI: 802.11: add guards to lkpi_ic_ampdu_rx_{start,stop} After updating calls into lkpi_ic_ampdu_rx_stop() were seen along with panics. Working backwards adding checks to each level we lastly ended up fighting a lsta which is NULL. Simply return in any error cases as there is nothing we can do and just leave it to net80211. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8475942ca8e887287959ec2671266a210f41ed86) --- sys/compat/linuxkpi/common/src/linux_80211.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index d0d32fbe88d8..783e54070538 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5575,6 +5575,12 @@ lkpi_ic_ampdu_rx_start(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap return (-ENXIO); } + if (lsta->state != IEEE80211_STA_AUTHORIZED) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p state %d not AUTHORIZED\n", + __func__, lsta, ni, vap, sta, lsta->state); + return (-ENXIO); + } + params.sta = sta; params.action = IEEE80211_AMPDU_RX_START; params.buf_size = _IEEE80211_MASKSHIFT(le16toh(baparamset), IEEE80211_BAPS_BUFSIZ); @@ -5651,13 +5657,35 @@ lkpi_ic_ampdu_rx_stop(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap) lvif = VAP_TO_LVIF(vap); vif = LVIF_TO_VIF(lvif); lsta = ni->ni_drv_data; + if (lsta == NULL) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, lsta is NULL\n", + __func__, lsta, ni, vap); + goto net80211_only; + } sta = LSTA_TO_STA(lsta); + if (!lsta->added_to_drv) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p not added to firmware\n", + __func__, lsta, ni, vap, sta); + goto net80211_only; + } + + if (lsta->state != IEEE80211_STA_AUTHORIZED) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p state %d not AUTHORIZED\n", + __func__, lsta, ni, vap, sta, lsta->state); + goto net80211_only; + } + IMPROVE_HT("This really should be passed from ht_recv_action_ba_delba."); for (tid = 0; tid < WME_NUM_TID; tid++) { if (&ni->ni_rx_ampdu[tid] == rap) break; } + if (tid == WME_NUM_TID) { + ic_printf(ic, "%s: lsta %p ni %p vap %p, sta %p TID not found\n", + __func__, lsta, ni, vap, sta); + goto net80211_only; + } params.sta = sta; params.action = IEEE80211_AMPDU_RX_STOP;