From nobody Sun Apr 20 18:28:20 2025 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 4ZgcSh3mXvz5tSjg; Sun, 20 Apr 2025 18:28:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZgcSh2q2Xz41LT; Sun, 20 Apr 2025 18:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745173700; 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=1bjVfKkAOI0apsnAolT5nbYtJiXWthMmmu6yYxmuqiY=; b=Or2+/SjK3V7zx9BYtgxUJ4WWx2gOHffOXO0OH9TiahPhnEejyPIrCAb2RcV/Q45/M1OU9q B8yVEnbMOXZ34zb+qYHUbHBX5+F8WkfkINBtjjMLO8ztvclEJNY4+EcEfWyFuQjN1GTlxk tRW2H4ekLL3P3aZo8OSeEZhR/dC/MZ0wNGbX5KMvbcaLP2ZrZpwUFdYC5VTaCgZGMEuUT0 QKLIaPneL0nwzuwm0ogs8CLGel2ib91cMR/vXLBSNqdY2aOEoHEaVNl8OAeEecJS6NGzHQ uv4IkC5mznuSewTCxSvitJ4ZBYVRsGnwPrDLQihtzGeFJZxPI/LbjtG27LIGUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745173700; a=rsa-sha256; cv=none; b=I3bV0Ydr7hQG0bjTnErIVluCP7EtFiCKBfcZ/OUO0S2QGGZyYZFf7GlK+GqsHrOnX3cxNk k5Q7GnDssd7dgXgcewXTGovQ7W0dGymkaFichBdA9P1TFcPUQaedg7MfucYBQA+qiLY48e k511OmIWkcu4aTCnvF9GzW60ohXzTtLnbsoF4eKKsvzDxBWWrXrEILq5+478GwINDWq2kb NYq/m56BuV7Q6N4MhVrLBtZWcsKWNILL9bS/lMTvtSupdxixnMyGh+Dv6PVo+bkKBadV2M A7Ur3nYM2F4KLzeqideasu8w3sksxs34h2qLkm6Vbw+wFqHKxUUq7l98JdERHw== 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=1745173700; 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=1bjVfKkAOI0apsnAolT5nbYtJiXWthMmmu6yYxmuqiY=; b=NiKfY1zWv+bHxzng7AwOAY7/CHR7eDVvXaXBHbUAsEFL0sioseQdG+2eYmelmf1GX643RF P5O8WMZLpOOOgrZgPsmfxzYydRN6h3TZGmrltM9H1tvijj2anQpGoIW9RvlYInwhKyIBWF 4Qal1lNhbzEVkbHzb5pa5/K9MG5SY/4KBwVXDYC91QjIo6PLcQak6RJCESfg7cDhzwW3vb mwj9VGuz2+ka4LAGdD5Jl+eCCm+hRyQoQjPZ73jdRn1/vJAJTeG/hBMNKvZbicZCoOKniQ lwfG9t95MlZli2kVTB7M2Vpz1deyCfX4cSFviHmNr0Szp4IUVMQ1R+YUeNzleA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZgcSh2QggzYX; Sun, 20 Apr 2025 18:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53KISKqV012429; Sun, 20 Apr 2025 18:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53KISK2L012426; Sun, 20 Apr 2025 18:28:20 GMT (envelope-from git) Date: Sun, 20 Apr 2025 18:28:20 GMT Message-Id: <202504201828.53KISK2L012426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 40ad87e958e8 - main - usb: if_ure: stop touching the mbuf accounting on rxq insertion 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40ad87e958e8a9cd5d5c3380e709c7503dd12210 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=40ad87e958e8a9cd5d5c3380e709c7503dd12210 commit 40ad87e958e8a9cd5d5c3380e709c7503dd12210 Author: Kyle Evans AuthorDate: 2025-04-20 18:28:12 +0000 Commit: Kyle Evans CommitDate: 2025-04-20 18:28:12 +0000 usb: if_ure: stop touching the mbuf accounting on rxq insertion uether_rxmbuf() assumes the uether_newbuf() model where the caller has just set m_len to the entire size of the mbuf, and passed the final size into uether_rxmbuf() for finalization. In if_ure we're creating our own mbuf chains, and the accounting is all already accurate. uether_rxmbuf's logic won't work at all for a chain, so let's add an assertion to that effect (but I think the other callers were all OK). This fixes a panic on my Windows DevKit when undergoing any kind of network stress that surfaces after the bogus mbuf is injected into the network stack (usually observed in `m_dup`). markj and I had spent some time investigating it and decided there's some kind of buffer underrun happening; the rx packet descriptor reports a length longer than what's actually available. We discard the rest of the transfer, but then we end up fetching it in a subsequent transfer and end up casting packet data to a `struct ure_rxpkt` incorrectly. It would be better to fix the underlying root cause, but this is a reasonable mitigation in the interim. Reviewed by: markj Fixes: 7d5522e16a ("A major update to the ure driver.") Differential Revision: https://reviews.freebsd.org/D43465 --- sys/dev/usb/net/if_ure.c | 8 +++++++- sys/dev/usb/net/usb_ethernet.c | 9 ++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c index 7c9b74334b58..c3f7b622d687 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -707,7 +707,13 @@ ure_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error) /* set the necessary flags for rx checksum */ ure_rxcsum(caps, &pkt, m); - uether_rxmbuf(ue, m, len - ETHER_CRC_LEN); + /* + * len has been known to be bogus at times, + * which leads to problems when passed to + * uether_rxmbuf(). Better understanding why we + * can get there make for good future work. + */ + uether_rxmbuf(ue, m, 0); } off += roundup(len, URE_RXPKT_ALIGN); diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index 977805cefe66..692ea64128b9 100644 --- a/sys/dev/usb/net/usb_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -593,7 +593,14 @@ uether_rxmbuf(struct usb_ether *ue, struct mbuf *m, /* finalize mbuf */ if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = m->m_len = len; + if (len != 0) { + /* + * This is going to get it wrong for an mbuf chain, so let's + * make sure we're not doing that. + */ + MPASS(m->m_next == NULL); + m->m_pkthdr.len = m->m_len = len; + } /* enqueue for later when the lock can be released */ (void)mbufq_enqueue(&ue->ue_rxq, m);