From nobody Mon Nov 02 12:38:05 2026 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 4jJB7f2nMRz6yGvV for ; Mon, 02 Nov 2026 12:38: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJB7d4Vhlz3CJn for ; Mon, 02 Nov 2026 12:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793623085; 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=MGwSkTT/vqdicqIs6e3MxZ+4vw/jb5VaYC8EY3dGlo0=; b=k8L0Gj7prBdl8hQ61IERyRpwppqXWotH97/QqSsEliT3TmRIcJjjnsj5HF4oOHJOOUI9P2 Y8YxyFKWCm6Sy/PdSRjc7HiRNzrIACpHLx5sYZGm7MK1XU769OOQq6pFei4v9EhmGpiKEz Ow4v4vSlAiepyo4doexjDx/pC1BcNSHiJwGdXeqJULKWpY6TOPa4f9M94Upd/nVQW2pj8E EeZcc5MluDgmmfWz0NwcsJzBaRD1g4bTFMbVF/EVKXGeA8TzojjX0GIov2EePS49IiaXo3 8V/iUS4tV4RWKMhRPIDvwYiUvSVDOw2NKtVxijOMyBvmhYeP8wzsqnjGu5088g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793623085; b=SFn/gK2H/ICdNdzrwKnwVfMRpNToMe29c11O0ncc+zqHns0vmxsKiGKjm7TH+gRL95h0Hy tLYKT/5HxwNg4c5BDjD5ScaQd8764W2NfH/nA/2snlAhL4iDEqCy9bdP+JOEeEDD47xm23 4gUjuwe/FXeRhLemnrQ3+VDYJTz8JKgG6t8G1DIs4say5PzBHs6ZK7ZlJRcpELKWIisUdm 5Cq3+4T9BORbAjjqRPdaC0ho5p4TfFzUxrgLEc+MaRpJT6LrPdx8F/Jil8DwVCBZL+ut6t qLvV+cDo79ZgtReLQa1JddyZIoh0nHqDR/m+XxZfKCogMlO8xXBkiij4dwYBgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793623085; 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=MGwSkTT/vqdicqIs6e3MxZ+4vw/jb5VaYC8EY3dGlo0=; b=Lb4E75ICArRvFCwRZnoqcPsD2FZmDJC9OtIDNvc9KgdFZolO2nekahPhek2h/T34YkVnsy 21gjihpnZ2euFlO5MEhSt527b2O4lIyV0csO9o9PUSxPIIc/T8a0Trebhygbq0O+jjtX26 +zYXJRezk4mx/yaUg+MzOqT9UQq+jdwxo7EBWUlivi9peeCcTizyksgMk3aFY6Cj//Jmo2 ZuHeBBaxXkVzk7uJ2GyLSmv4VRef26gJ0Pv4u6zww1JqJalxfUDoqAID49HF+f6kT5RBG0 RBes3RpKEvyejT98wE1VegqsL2Q6lzZHV+ZXntOLHJQiaFbRFUdphamoiNi0FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJB7d1kNszmPy for ; Mon, 02 Nov 2026 12:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 304a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 12:38:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 18bce6e65cdf - main - tarfs: Fix length calculation for file read List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18bce6e65cdf059618ff12ace82a9f7334e1b610 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 12:38:05 +0000 Message-Id: <6ae8842d.304a6.5614edfd@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=18bce6e65cdf059618ff12ace82a9f7334e1b610 commit 18bce6e65cdf059618ff12ace82a9f7334e1b610 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-02 12:29:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-02 12:29:25 +0000 tarfs: Fix length calculation for file read When the offset is within a block rather than at its beginning, the length should be clamped to the remaining length of the block, not its total length. Reported by: n0ps1ed MFC after: 1 week Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D60904 --- sys/fs/tarfs/tarfs_subr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/fs/tarfs/tarfs_subr.c b/sys/fs/tarfs/tarfs_subr.c index 180e0a53f8b9..0cb5eec8c385 100644 --- a/sys/fs/tarfs/tarfs_subr.c +++ b/sys/fs/tarfs/tarfs_subr.c @@ -428,7 +428,7 @@ tarfs_read_file(struct tarfs_node *tnp, size_t len, struct uio *uiop) TARFS_DPF(VNODE, "%s(%s, %zu, %zu)\n", __func__, tnp->name, uiop->uio_offset, resid); for (i = 0; i < tnp->nblk && resid > 0; ++i) { - if (uiop->uio_offset > tnp->blk[i].o + tnp->blk[i].l) { + if (uiop->uio_offset >= tnp->blk[i].o + tnp->blk[i].l) { /* skip this block */ continue; } @@ -456,7 +456,8 @@ tarfs_read_file(struct tarfs_node *tnp, size_t len, struct uio *uiop) while (resid > 0 && uiop->uio_offset < tnp->blk[i].o + tnp->blk[i].l) { /* now actual data */ - copylen = tnp->blk[i].l; + copylen = tnp->blk[i].l - + (uiop->uio_offset - tnp->blk[i].o); if (copylen > resid) copylen = resid; auio = *uiop;