From nobody Wed Sep 02 22:40:43 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 4hZyP80p8Qz6qpSb for ; Wed, 02 Sep 2026 22:40: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hZyP74F1Yz41rD for ; Wed, 02 Sep 2026 22:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788388843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pPP7uh1zS8fs+w0ck/5lTTKRRFKdF34tvulQxYAEIs=; b=yOmjh+HndD93mSbHreFW1ElT83QQUh/o8s2RqDGR6OSLLrOwILghFs9u4oDlYmCrWkM/f+ UbtovuthALgDPvzcGnivB2GyEh/IR6tFYSSm6dOhTQ3feemxMnkSRd6gyDtMHEOEWLvydq i7YUJsEUWh0WcG4UTOX0814m9EXlM4/m8MOCk92L6k1MfJy0Ss4W3CZ03XB5eTKm6wfV+G n36iWvItsOUtrNw0hqYgmd2FI6qqRAqaVT3C/gOyAyhtFLtL6tGZ/e/RuXsb9txHvEwCVz 6MlG/EScliiuVhv/d51zDYAae96PCScMxxRl+rxmBTm6C2RC1cK7T5GCWXnxHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788388843; a=rsa-sha256; cv=none; b=YzPp8VUxnlNrf95kgCouN/mv2hptbVuqE6aVLuV7TxFXIqI+3t0Xi+GsCc69Zpjp4kHD6B 4HY7F/bH6BfSmRA46ICoI/fG5Ffc4Ky0cdG/WDzHiHCxpsPieOoY3Xljq2YoKZ8rnTgKkU hCcCK0EedDkCherdQe7Da3QvTOnFs8Othoe1f7IEd0PX85uNgF5PTYcjyfoTchAVjDuN/V sGpaoH80rFllvO5+LkjopV5UX0QGwj8pLWl18mJCQIMhTsrDn13GO+Mj9LQRgVO8U/yHuE Twhu+17DwU9WzPMOpHdGhBhWc13WyQJ7sPXgMi7JIY0jdFokuM+jr5SxT9nW2g== 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=1788388843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pPP7uh1zS8fs+w0ck/5lTTKRRFKdF34tvulQxYAEIs=; b=A60xtDT8uJv9QObw2ynnW9N3TwdGrVBOFjpnmz8Y5/iWOTvJlW3W4D/5ZTaDrK/Fm6jQoI +WGWIRDsalhyBMQZuQIIbwsXpsnKvvWbdd6dt+MKb2DQrpHuKlPT/yGBsFMC2/lu12FkHC rMITYnoExHo4rav7DctM+yQlyhcBk3Cccn7JJqHyZTH+NV2ntxKUy27rRGSlFMKyJ7Qm1L o5O7XRlmvkNKNDdQIZsuiLSsBeAdEFsASR1PhlA8qNejXgf1MWGQBU/e0ESx4Qir6+P4sN kwownf8N5wxUtHWOCqWiMnYUk/lzLg+LFvmM0melJkVI93I4kb6rVssJ+eiAlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hZyP7360wz12kV for ; Wed, 02 Sep 2026 22:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fa00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 02 Sep 2026 22:40:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Griffiths From: Mark Johnston Subject: git: 6391876d20ba - stable/15 - rsu: add a runtime TX buffer bound check for a kernel buffer overflow 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6391876d20ba14de3ee0704e6f77d6d14ef8d672 Auto-Submitted: auto-generated Date: Wed, 02 Sep 2026 22:40:43 +0000 Message-Id: <6a98a5eb.3fa00.66969551@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6391876d20ba14de3ee0704e6f77d6d14ef8d672 commit 6391876d20ba14de3ee0704e6f77d6d14ef8d672 Author: Andrew Griffiths AuthorDate: 2026-08-20 14:30:03 +0000 Commit: Mark Johnston CommitDate: 2026-09-02 17:40:28 +0000 rsu: add a runtime TX buffer bound check for a kernel buffer overflow The rsu driver currently relies on a `KASSERT` to prove that the mbuf payload plus TX descriptor fits in the per-transfer USB TX buffer. On production kernels without `INVARIANTS`, an oversized raw 802.11 frame can reach `m_copydata()` and overwrite past that buffer, causing local kernel memory corruption. This suggested patch replaces the assertion-only guard with a runtime size check before the copy. Oversized frames return `EMSGSIZE`, leaving the existing caller cleanup paths responsible for freeing `m0`, `ni`, and the unused transfer buffer. Reachable via root / bpf access Reviewed by: bz, adrian MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D58898 (cherry picked from commit 81a67bfebc60055bbf19ce6e39537fb5f53eeee5) --- sys/dev/usb/wlan/if_rsu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index 07f7b6f3a708..de033c7135fd 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -2885,6 +2885,9 @@ rsu_tx_start(struct rsu_softc *sc, struct ieee80211_node *ni, */ txd->txdw3 |= htole32(SM(R92S_TXDW3_SEQ, prio)); + if (m0->m_pkthdr.len > RSU_TXBUFSZ - sizeof(*txd)) + return (EMSGSIZE); + if (ieee80211_radiotap_active_vap(vap)) { struct rsu_tx_radiotap_header *tap = &sc->sc_txtap; @@ -2893,7 +2896,6 @@ rsu_tx_start(struct rsu_softc *sc, struct ieee80211_node *ni, } xferlen = sizeof(*txd) + m0->m_pkthdr.len; - KASSERT(xferlen <= RSU_TXBUFSZ, ("%s: invalid length", __func__)); m_copydata(m0, 0, m0->m_pkthdr.len, (caddr_t)&txd[1]); data->buflen = xferlen;