From nobody Thu Aug 20 14:30:38 2026 X-Original-To: dev-commits-src-main@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 4hQm7f4cmXz6ngZ6 for ; Thu, 20 Aug 2026 14:30: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 4hQm7f2CPZz3SvV for ; Thu, 20 Aug 2026 14:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787236238; 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=V0obrtwwuIZeeakwjgQeOH8gJ5smZdCcWD2lRnpIZZE=; b=YOhTIsGqAH+/qez/uHLtiDeCswj8wzJGyTgZcxaPNJkz6AKnxUX738m2Lf9nvs/WNFCMjP KC1y4qBYx6EnJrGmRhQrnyKRQ00dZn7mW9S1w4D8pjttCmLxEj5/HWx4DLZGqpJ3wyP6Xh vC0TtWkG5F48wGUO9nBV5ipP6aQityYIQnlzNG9LYeQpQ625jsfuqgApq/bVZrEksJe8/d ES/a892reR+gAGZ20mCo+CnuD+pOT5RCIHUtVkppPUKc/HK0oLyfF1yio9yZxghinyA/A6 Y5ioP+Es+XczKMlZCPjthEXs6wHvC0SrKlvOwloNc6bFQKAY4ou2hu2Bxc9bKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787236238; a=rsa-sha256; cv=none; b=GbWZ8eIGbk/lgkbRR/6bR8y976VtIQ3aB+R3e1vo3artJJd8upp556TMYOuPQsnRUK+jzA Z3Nqu1GTBqnHwGiIKveJ08jy7OcJfiyEzy5MNSzhI0SoreWhVERUEphUu06RpEz6gKtiaT 5olTL42dLCY+8Ao6ZIsj3Qjx/zcIPRW/SDCggBs6k6AAOB0uw4StjCI3qlNFRPCMn9CUFY EZCzjTs3HQUBMhZoSVvrNezLNXPMvwtR1O8F2z4GNBeWrWwAaMpUk5MBoNjSp3DEa5ZG6Q sL3QAZ62sXpFLYm/ljFXxZPJfaq+f5+YjsxiUxWYpxl/tgtqEgqzqgwHU5knZQ== 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=1787236238; 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=V0obrtwwuIZeeakwjgQeOH8gJ5smZdCcWD2lRnpIZZE=; b=BQqmCGetVK7vw0NKY+l0pPyKyN2m37ltO1Rmo/gRoGTlFuvdAn14RQb8Rfc7YZDfgkgCPf Y6p/38vB6HrYFRz+ENq9E5isrN6Yc6gNesgM6jWe2gCE7sCPVKu9pRDEKK6O0zigvOBJrH GBRvO3WzBE/M3y6BkzpXuybTVGEyK0x82nBvOOavtvQjAP24ZYPsquyBBImNvQD9k1XDAD bxnGXN744OIol4DXYwbXV6Gprf5NEc4pp5Zq3stxNaEEbZziZoMRJj4736Ydq166pbXJU/ sAv3slMKeLc9I3AT7eaB1uSDtwxabYg2CVBR2lou/dGubkDeDrxkb7nJpc/moQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQm7f0TSdz57w for ; Thu, 20 Aug 2026 14:30:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3265d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 14:30:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Andrew Griffiths From: Mark Johnston Subject: git: 81a67bfebc60 - main - rsu: add a runtime TX buffer bound check for a kernel buffer overflow List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 81a67bfebc60055bbf19ce6e39537fb5f53eeee5 Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 14:30:38 +0000 Message-Id: <6a870f8e.3265d.c2ee8dc@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=81a67bfebc60055bbf19ce6e39537fb5f53eeee5 commit 81a67bfebc60055bbf19ce6e39537fb5f53eeee5 Author: Andrew Griffiths AuthorDate: 2026-08-20 14:30:03 +0000 Commit: Mark Johnston CommitDate: 2026-08-20 14:30:03 +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 --- 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 2f934737f699..68271f365dd5 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -2917,6 +2917,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; @@ -2925,7 +2928,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;