From nobody Fri Mar 24 23:57:02 2023 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 4Pjzdp2F1rz41K8k; Fri, 24 Mar 2023 23:57:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pjzdp1hCbz3wvV; Fri, 24 Mar 2023 23:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679702222; 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=SX/InM72ID1cjhC7Co2zsFrKYMIVOeROETmG6aNy6nQ=; b=c7sENomvewvD6Ao6qvWd4HPD75rxvJ9bcfYYoVRE9YSdRXBdyVWYgiI9pmb6PODMdMvxci R22m46YRFl6FzBYqwkmJ0kdCHaCn6lWlHEGvZqsyAty/pblvMt67NLny0rZI6RhGwd9LPQ 6t+rHKvb5tGSjWiK3cyIY3JxcyEAUkMev0QuoO2SopG4gnEjwi7ka06amOdCjLJzrqPNV7 3QfkOGWfNWtNKIZNrx2ClTY7HY4Rrj/fI/6mQiHIh++sbhU1XCTBwZa9J+7RvRwA3rp/gD LU1I0XuteIgre16GckwksBRm2Ppvg9eXS+a79StUtj1gB+de19wfLWMaWNgUvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679702222; 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=SX/InM72ID1cjhC7Co2zsFrKYMIVOeROETmG6aNy6nQ=; b=jvB6Op0vokvT43gEqVX+H93osSC4q9GnwTIEXUuGmMn9EgFIo0k9TmOdvGIJ1kw4RKPAOB cutRrRQsdViWznHMoMvtX7uQCS4xEcp/MB8ROMBwwJIUMoQhp9KtkGtypfPNj0iO5PhyQp WUKEcN5TYqrKoHv1UIv3mO4TKAZIsN0hR5J36o4LpyZdAnAz864970g0YAjHbyDVbDPse+ 7CEu59Avt9M+uPlsTEPkR1hB+nKF92YkmnjJx3mRShp5uXFAw8yNFiWEx7WinXQ85xrJTB MovTosnpJK6yrIiQaTKzfcRULg6KfAugEbpIpixq2IK75g+iL5gOAZoMfC3U7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679702222; a=rsa-sha256; cv=none; b=hThupung6LCqqzj8YcdStZIDxTx/gErh7mMCar5tNL2lvwplT6a5JF/ZEiQ0yEF4SQhTw9 MlSkLJ+NWTIGeb/vRYr0BjOEtgb65g1xMWH6aKbY2us5XXEyO4lXeG5mgdM0a0XszA8rcr 7Dqp72g8+vinDpjH+KYllCZSS1elpVbZlr2mmDcZGUOtZNIbGQSJAPzdzqe25p4MfhGT+z 5c12HaOYNQqqT/ttlprKiZ22L7rfiXEvI1Cbl2n9dKIaMuuN4cabtqPph/RtEFe/Ep5Yj5 yxxDozIyycXSu+snrfohFO+P0x3p5vIwGJWhYE1HXoWw9SuTL//WVYykSGciVQ== 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 4Pjzdp0lg6zddk; Fri, 24 Mar 2023 23:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ONv2Ko084732; Fri, 24 Mar 2023 23:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ONv259084731; Fri, 24 Mar 2023 23:57:02 GMT (envelope-from git) Date: Fri, 24 Mar 2023 23:57:02 GMT Message-Id: <202303242357.32ONv259084731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d7ae385428ae - releng/13.2 - mbuf: Fix an offset calculation in m_apply_extpg_one() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d7ae385428ae8df4b5a39f752b389a9375597748 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7ae385428ae8df4b5a39f752b389a9375597748 commit d7ae385428ae8df4b5a39f752b389a9375597748 Author: Mark Johnston AuthorDate: 2021-11-10 21:57:12 +0000 Commit: Mark Johnston CommitDate: 2023-03-24 23:56:47 +0000 mbuf: Fix an offset calculation in m_apply_extpg_one() We were not including the requested starting offset in the page offset. Approved by: re (cperciva) Reviewed by: jhb Fixes: 3c7a01d773ac ("Extend m_apply() to support unmapped mbufs.") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32922 (cherry picked from commit ac2b54441742b3148de72e3b29aa0f00d29bb825) (cherry picked from commit 70421fd527e315bbc4850db2d7e80fc008393bce) --- sys/kern/uipc_mbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 13c98d0895fa..abe292013d28 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1293,7 +1293,7 @@ m_apply_extpg_one(struct mbuf *m, int off, int len, pglen = m_epg_pagelen(m, i, pgoff); if (off < pglen) { count = min(pglen - off, len); - p = (void *)PHYS_TO_DMAP(m->m_epg_pa[i] + pgoff); + p = (void *)PHYS_TO_DMAP(m->m_epg_pa[i] + pgoff + off); rval = f(arg, p, count); if (rval) return (rval);