From nobody Wed Jul 15 13:50:37 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 4h0cy61WVDz6lVs1 for ; Wed, 15 Jul 2026 13:50: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h0cy60GJWz3Wds for ; Wed, 15 Jul 2026 13:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784123438; 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=pnXMkw9QtNTBGxQKbu/xUbC88zomcgsZrBvDdwgfT2k=; b=iEVULwfR+FWjoLfSzcLsauBs2QANzL1l+u5QuoD2ovwFOEOCnCe6N0Kp2+xCzOWqZY6AVf Ut6Kh0GH56Yk3niEHg92WTxuD1NKdVA0qe1drvtTI+aFxx+x6o+IifEAT+3yShKSoQ3RQk eAvEo94UctuJ3f3bxp6mlY8CLOQHc1RWAikSj26ECkvU3N7gg549q3fjtZvFtvtGogO0xk 48L0GDxAHJ5VU9SuV+GUimquSUyPnxLVUFaIV9AUdwh4RTQlODibcT3N8OQRCVX0ySVj8M iuBrmokuh6FOelo8aVH+BiBu5W+hpUXj60VXZo5YD09neik47PEQHaJlfQQRZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784123438; a=rsa-sha256; cv=none; b=iYFp7Y/9i8lb3oci/7DyqbfCxn+0hKZqAkygF7yil6BuTzZrkLPGe+ogo8Q0U12JSb659B MOZQVi1/OgBOfueRwfXgouON0mAiS8QCZVAd6WtBlHb6df092zy3MlfO8AC9kc4UUXGN+s XYr9n12vQa6Qy/qPy9ym3GD0c8+xOTon7Y47kS0YmjKLOoNK7oetY6vxw/xUV3VhnUggnY UzddLWVZJk6X/brNuxYCJ/xQsZwKAupfC0B76FlCW1wbrKmy4Uyesrh2XUxF9CSzsuYZ9f rr+m6e1+7HNTMWGy9MdrZUlrq4T9PjVJRqmKaOKdLC+dKB/0H2g0dwo4sQoJcQ== 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=1784123438; 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=pnXMkw9QtNTBGxQKbu/xUbC88zomcgsZrBvDdwgfT2k=; b=hGDMAjxFtcS9KJBe9wbyCJQlwtZLaRpgg0mS2x0xvjdvWfx7b+hIeBNvM+FsZ8A8oTtHKl AAUyXfvzYu/emrO/2MS0fFzsaF6eCQIb0dJn8nbBdgv5JB9T3/SSd/c1g4Wyq0XOLswg4N 4K/oqy4NJ+tiE515wmYwF8zcAyMGyf84JAIliQHXfrk2PxwgdmDz+BMMjQ+OmcyrXFtVtv nGFR0lWYuXvxvmZ0s+dM9E2UDnPvKG5QeW8/BQzu8ZgFOxHL2wa/JlRz/K332rUVadQYKm YjvlpZ6PiKtTvxVeH3/4jlSww6CsM5GoVvrJnT/Jhqu1hJQI/KeiiBXpC/pNFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h0cy54z7pzZlM for ; Wed, 15 Jul 2026 13:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3970d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Jul 2026 13:50:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: KUROSAWA Takahiro From: Kristof Provost Subject: git: f2202ab5abda - main - mbuf: make m_unshare() allow unmapped mbufs 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2202ab5abda7fb09538a1ceda77569b67d83084 Auto-Submitted: auto-generated Date: Wed, 15 Jul 2026 13:50:37 +0000 Message-Id: <6a57902d.3970d.2efed0b3@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f2202ab5abda7fb09538a1ceda77569b67d83084 commit f2202ab5abda7fb09538a1ceda77569b67d83084 Author: KUROSAWA Takahiro AuthorDate: 2026-07-15 08:28:00 +0000 Commit: Kristof Provost CommitDate: 2026-07-15 11:44:59 +0000 mbuf: make m_unshare() allow unmapped mbufs m_unshare() had crashed if unmapped mbufs exist in the mbuf chain. This was because memcpy() with mtod() was used without making sure that the mbuf was mapped. Use m_copydata() that cares unmapped mbufs instead. Reviewed by: gallatin Differential Revision: https://reviews.freebsd.org/D58189 --- sys/kern/uipc_mbuf.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index b3632c0bfff6..ffdd115e3e0a 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -2160,7 +2160,8 @@ m_unshare(struct mbuf *m0, int how) * crypto operations, especially when using hardware. */ if ((m->m_flags & M_EXT) == 0) { - if (mprev && (mprev->m_flags & M_EXT) && + if (mprev && + (mprev->m_flags & (M_EXT | M_EXTPG)) == M_EXT && m->m_len <= M_TRAILINGSPACE(mprev)) { /* XXX: this ignores mbuf types */ memcpy(mtod(mprev, caddr_t) + mprev->m_len, @@ -2189,11 +2190,12 @@ m_unshare(struct mbuf *m0, int how) */ KASSERT(m->m_flags & M_EXT, ("m_flags 0x%x", m->m_flags)); /* NB: we only coalesce into a cluster or larger */ - if (mprev != NULL && (mprev->m_flags & M_EXT) && + if (mprev != NULL && + (mprev->m_flags & (M_EXT | M_EXTPG)) == M_EXT && m->m_len <= M_TRAILINGSPACE(mprev)) { /* XXX: this ignores mbuf types */ - memcpy(mtod(mprev, caddr_t) + mprev->m_len, - mtod(m, caddr_t), m->m_len); + m_copydata(m, 0, m->m_len, + mtod(mprev, caddr_t) + mprev->m_len); mprev->m_len += m->m_len; mprev->m_next = m->m_next; /* unlink from chain */ m_free(m); /* reclaim mbuf */ @@ -2224,7 +2226,7 @@ m_unshare(struct mbuf *m0, int how) mlast = NULL; for (;;) { int cc = min(len, MCLBYTES); - memcpy(mtod(n, caddr_t), mtod(m, caddr_t) + off, cc); + m_copydata(m, off, cc, mtod(n, caddr_t)); n->m_len = cc; if (mlast != NULL) mlast->m_next = n;