From nobody Thu Aug 28 13:55:21 2025 X-Original-To: dev-commits-src-all@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 4cCNFk0V8Mz663WR; Thu, 28 Aug 2025 13:55:22 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCNFj5BGNz3vYY; Thu, 28 Aug 2025 13:55:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756389321; 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=jW4TB0tOXbdj2txrN88SNAbkJ/YlcYOBf7R9B01hEvY=; b=HX8Q1Zs94s70jiG3wpNWqTAzqZQ9vRL28uHF1BWVFE+Xn9/HtFpYKrNkGVKiqwQgjpxxM5 Og/H/74PJc0u3pBZbm3LB6oxTNuROUWifcdIhSBPzzHy3o4NHC5P9+7BZtY4Ft8cKxHbme SSRn2LTYXCA83b2+X0gzqmNxh+Onz5VXBfEJaAq9TXn4MW74pS/uSrHcMRJ3ePvHl3ts5/ 4KyhgOpYZQwqGbbpkp6W15vmesnjcIDigmFfOi0aNSpALmjiJtwD9/Omgcs1DNardBl/g4 nJdJFaa2b2XIlI/0lR3kEA9uJDvHv3DpzwbeLcsg8x/N2PmC9KjBOd+psDAR/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756389321; 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=jW4TB0tOXbdj2txrN88SNAbkJ/YlcYOBf7R9B01hEvY=; b=OrVlzEuSkBYgk4U64hEoeZZxGxRJIZ12JJ+EfrY3ka7quRhyo25oGnFAkPnjlNP1gSX8vD 7qNKdBbRwycpsVaYWUdQ2pZv9TMplZ5g2xasHZ8Irtpsq+50qgb/6Q+bhB9F04LdgLU3Bm T1SJM7RJBrXk7ONtIH7g2HomIVbslwQOHz3dPSLIsewj4J1WNE3aPF/R9TzTkZGIFDOS/r /Pc8sHukohgeHAVmbH1ozj6Nf11UjSvIv3EAzX1ADAUaEkUMYMNCYhWvaz4D/5iI4H7yLX JaU9vYeviXJgBQRPZ6yjd+aHlupwD1noDKTkl87jXiH5sOgCO+zZn62AkFq39Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756389321; a=rsa-sha256; cv=none; b=limIIWjbJSM7FdeFgS7cG/VbNZtQJ+qBZ435jgwIgDwf53Eux0m9Z03sx9E7bOi+p5blu/ oV8MNomNslmB2BFBvVC183EDUZ2duo8OGdOXYEszDEtyU1se/mU9AJIirRN0IIunHLgcE4 RE50h3zXdEBNOU7f6PdZ8iZW7f8afzV8HtZ2b5esUzaeavpDwPx1P4zsgeOeRDgrOuizP6 pzVO5NxxIBlW9JdGpLdA00tX036TX1w/dqNDY4zfC090545bsJuhnfMMvEbROCIyDzslo1 2hsZoqQxoIbkl3MpuWBunMod9Qb3T3tF/OdqgLhcr3sfJDnMowcusSs1hoP9cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cCNFj4hZQz1BXl; Thu, 28 Aug 2025 13:55:21 +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 57SDtLxq040547; Thu, 28 Aug 2025 13:55:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57SDtLfW040544; Thu, 28 Aug 2025 13:55:21 GMT (envelope-from git) Date: Thu, 28 Aug 2025 13:55:21 GMT Message-Id: <202508281355.57SDtLfW040544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: c73d3c6c960b - stable/14 - mbuf: improve KASSERT(9) falure messages in the m_apply() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c73d3c6c960bef6222fa03a1119df0bb5380a611 Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=c73d3c6c960bef6222fa03a1119df0bb5380a611 commit c73d3c6c960bef6222fa03a1119df0bb5380a611 Author: Maxim Sobolev AuthorDate: 2024-09-10 01:51:05 +0000 Commit: Maxim Sobolev CommitDate: 2025-08-28 13:54:34 +0000 mbuf: improve KASSERT(9) falure messages in the m_apply() - Make less ambiguous; - extend to provide more context for post-mortem. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43776 MFC after: 2 weeks (cherry picked from commit a43fb3653b35ab88b72e1277dccc26328363cdb7) --- sys/kern/uipc_mbuf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index b10e524e6e4b..1ce049014711 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1375,14 +1375,16 @@ m_apply(struct mbuf *m, int off, int len, KASSERT(off >= 0, ("m_apply, negative off %d", off)); KASSERT(len >= 0, ("m_apply, negative len %d", len)); while (off > 0) { - KASSERT(m != NULL, ("m_apply, offset > size of mbuf chain")); + KASSERT(m != NULL, ("m_apply, offset > size of mbuf chain " + "(%d extra)", off)); if (off < m->m_len) break; off -= m->m_len; m = m->m_next; } while (len > 0) { - KASSERT(m != NULL, ("m_apply, offset > size of mbuf chain")); + KASSERT(m != NULL, ("m_apply, length > size of mbuf chain " + "(%d extra)", len)); count = min(m->m_len - off, len); rval = m_apply_one(m, off, count, f, arg); if (rval)