From nobody Fri Feb 27 02:29:44 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 4fMXN85c69z6T7lM for ; Fri, 27 Feb 2026 02:29:44 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXN82zlsz418l for ; Fri, 27 Feb 2026 02:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159384; 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=nHzAhlRxaeXlnRlFRi3uJdwbFQswAnin7pTK5DkxkZY=; b=BS6sGatTOJXlsv5qRxancwPqWeM8vpvi+7f46sv4sy7Q4HpDY3or7kRK245oBhty/axRnf pA7XR6Wu16Ud4wdyu8Xozxfuux395pf1tYERiq/w6hAy2D+LEoAmXAuGe1eSU3YhLXujN2 M2miBc2/8+pfrJoJlCyMKT1JoLfNqeGrsTqdGNfMBvQSjzo2owZGhX49rcCNePjfvw7k9o DHG5BWzDQoBXbToKPtTZfgu820xyoRTVVB15HbW3HNfOKFaDHxJJsHnVbBNKEZNmLb56sq Ocq7Voq7GIrec8PAmgs9j0Bixax+E9xLiat+J5Atl2oCy3JKNJ3tWNOG/9jYJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159384; a=rsa-sha256; cv=none; b=D72kZge74CQPN9+v8lRVJdYhQaqDti2Vrbc3N15BJjXJlNx3duLUU4V4Zl3UTy/6OsvcFh 10/tPjTbpxM0Q3viTZVl3PacT6oQCTE06ADf7QAAr0F/LCTquM3v1GaKdb8ShT/4UMQvj6 xUcN0uU6MrmOIP/GtXQWaBHzlfYJk5Dq8Z9q27jrI0d3VGbak3jjLzyP9NuA/K1dQDOMF1 S2yN1Gz3Xuw8q3haqmPQqQfw/9TRtE10rtscHMfC62IkXN/wd7zOAGxfMWaR2RFueqngeK O+RSbfAns5ou2Oxhqn2XGOV+qlhqXQ8wgUJ9H+ZOMHPuCz7NbxUhGo0kkCg3uA== 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=1772159384; 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=nHzAhlRxaeXlnRlFRi3uJdwbFQswAnin7pTK5DkxkZY=; b=G3za+M2pgm/9UITBBAPEPS4HJsZUrF5H6vOQbvhw0u6Ic7a5ucxiJ7IHTzddGqJhuRke8L ZTXSG0ExMXb4RE0fHs0EqgPOzMKOzblwqPMALTnrvYQ6ftYHEnes4i8+xPfkAVRDiOPkre 1OPsEza69pkSiHiUF3aOFegXmVT59Xo9SQ4F6AkIMNKgLjPZ82jFzwdTcpBv9qOPSy5Niv UAAJ5nyhHCkG51iZb/d5/rEPS3HIRglbsUswx0bj9DT2EkiGCBFWFAbZU/maIBYBxWv2Qy fSwNyrfnGSZ4xZCUuUAcbM0hKMfEnzZW5g/Q8L6p74hPPQBw5aqVPGE9smHDrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXN82SYDzyZZ for ; Fri, 27 Feb 2026 02:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f6f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d89845f449da - stable/15 - LinuxKPI: 802.11: catch possible NULL pointer deref with mt76 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/15 X-Git-Reftype: branch X-Git-Commit: d89845f449da734a3d9893552c5b0da963c90819 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:44 +0000 Message-Id: <69a10198.1f6f1.7641dc28@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d89845f449da734a3d9893552c5b0da963c90819 commit d89845f449da734a3d9893552c5b0da963c90819 Author: Bjoern A. Zeeb AuthorDate: 2026-02-04 22:46:47 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:01:54 +0000 LinuxKPI: 802.11: catch possible NULL pointer deref with mt76 With mt76 we, for the first time, see that txstat->skb or txstat->info may not be filled in linuxkpi_ieee80211_tx_status_ext(). Guard for these cases checking for skb and info to be not NULL and assume a TX failure in case info is NULL. Sponsored by: The FreeBSD Foundation (cherry picked from commit 94be5dbdfd22de4ec9ad699803ae18d9d209d824) --- sys/compat/linuxkpi/common/src/linux_80211.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 54571b28e2b8..0b732cb691c6 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -8304,6 +8304,9 @@ _lkpi_ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb, struct ieee80211_node *ni; struct mbuf *m; + if (skb == NULL) + return; + m = skb->m; skb->m = NULL; @@ -8329,13 +8332,13 @@ linuxkpi_ieee80211_tx_status_ext(struct ieee80211_hw *hw, struct ieee80211_tx_status *txstat) { struct sk_buff *skb; - struct ieee80211_tx_info *info; + struct ieee80211_tx_info *info, _info = { }; struct ieee80211_ratectl_tx_status txs; struct ieee80211_node *ni; int status; skb = txstat->skb; - if (skb->m != NULL) { + if (skb != NULL && skb->m != NULL) { struct mbuf *m; m = skb->m; @@ -8345,7 +8348,13 @@ linuxkpi_ieee80211_tx_status_ext(struct ieee80211_hw *hw, ni = NULL; } + /* + * If we have no info information on tx, set info to an all-zero struct + * to make the code (and debug output) simpler. + */ info = txstat->info; + if (info == NULL) + info = &_info; if (info->flags & IEEE80211_TX_STAT_ACK) { status = 0; /* No error. */ txs.status = IEEE80211_RATECTL_TX_SUCCESS; @@ -8410,7 +8419,8 @@ linuxkpi_ieee80211_tx_status_ext(struct ieee80211_hw *hw, if (txstat->free_list) { _lkpi_ieee80211_free_txskb(hw, skb, status); - list_add_tail(&skb->list, txstat->free_list); + if (skb != NULL) + list_add_tail(&skb->list, txstat->free_list); } else { linuxkpi_ieee80211_free_txskb(hw, skb, status); }