From nobody Fri Mar 24 03:16:06 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 4PjS5y4qTPz40yD9; Fri, 24 Mar 2023 03:16:06 +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 4PjS5y4PKBz3sqx; Fri, 24 Mar 2023 03:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679627766; 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=aOMczB0Cp8jcoQ9A873oXibyrqijZ/orq+9g2yCPjaA=; b=ZVUNvQAoGGQ9rTcfWdTbECAi+FoY9CY2zhR8WRfZ+Om0DKyAw63UEcA+WKDRobI8mo8lyc 4G2DImHfvmBNrs1V4675eGEGxkDTjPZpBvD4sPGpFdCy2Hso6oRRfy9PbV7DFA/RZaVuGC c7+rzHWiQhIU5LuOEnYUky7YZnArcSKQbpsEE3yLu4tGffs43MKyX9c9r1IitD+Ch9kWvG 43LzmvHU5wbCn6UhuPPM5g5t9TvnuU7iLaiNU8xy1oWPOkbLhOps1GSgok+SeJDFykpDzB tVHyIAQcOEzesZ3+4JtL9HBCKwrFfPKE6rchy/dIPR4v2xPO2qHs2IYld/hHpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679627766; 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=aOMczB0Cp8jcoQ9A873oXibyrqijZ/orq+9g2yCPjaA=; b=cP7YmSPKY33lYJrIod04whbZr5O1XSMKpcKZfP2iwEJjo1kGvl/PMQ7q9xeLZxtIVM0oc/ q7Psj+6KEql9xv21G9puF8FGcAd5ZI7FkLOpJqN8GWDAE8k+VkDHBZo0kUAMoLOwwOmVNq 3OUga9lLdhJLxdOMq2cVhw2wrX61TlIU8TbsxMDMDz5kGWmKCvooGEdui4yikzENnwqY5h GKFVpxX8eygoYwP4bX6opeMnJ1QrKC4DhADlfEuJLkjV0dhfVzNjLoBlbvWEJkSbMoweAI sFfqq6C1YrRMP+69hld1btNMXuUlWGpuNKJ1C+sEsy8Bf6PTQh4pCRiLmDqsTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679627766; a=rsa-sha256; cv=none; b=RSnVdabq5hyuNy4NTC//KivyhfELZ4eB835oBlyviFxFSQoozRGW+YJyrFKX8/DwICMqkM Puo19eNtpd+8TdvNPsm3LeDE99ghVtCvWMAeQp7IkYW0utF/NltRdr7TPDUjY0hnOfJA5c 1zgTWNZVuLHLNME98bDpAijGsVXxVgG9UxOpQtb34Cfam5hZK4QVs9mrOEnhbswilSM0Mm wANPCcrebTjdYag/4CudumvghvopMOWDGdv0VANfldZvdBW4LLpFeipk9jbJhlikGPxQcb rkvc6OiJY4aX8vQpMNclhyZ2cjJ+m2Kd1Xl+v2PZdCYgn4ovFiqcxtVA0OaZXA== 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 4PjS5y3TGYz11yK; Fri, 24 Mar 2023 03:16:06 +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 32O3G6nO044451; Fri, 24 Mar 2023 03:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O3G6n0044450; Fri, 24 Mar 2023 03:16:06 GMT (envelope-from git) Date: Fri, 24 Mar 2023 03:16:06 GMT Message-Id: <202303240316.32O3G6n0044450@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: 70421fd527e3 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 70421fd527e315bbc4850db2d7e80fc008393bce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=70421fd527e315bbc4850db2d7e80fc008393bce commit 70421fd527e315bbc4850db2d7e80fc008393bce Author: Mark Johnston AuthorDate: 2021-11-10 21:57:12 +0000 Commit: Mark Johnston CommitDate: 2023-03-24 03:15:45 +0000 mbuf: Fix an offset calculation in m_apply_extpg_one() We were not including the requested starting offset in the page offset. 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) --- 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);