From nobody Sat Aug 23 21:25:20 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 4c8VTD6wkcz66S6H; Sat, 23 Aug 2025 21:25:20 +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 4c8VTD5X8sz3vdp; Sat, 23 Aug 2025 21:25:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984320; 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=Wv/RkPRRIQnVSPQmsQmQubuGdmLgcsfogTvA0XqbKV8=; b=OaRWrgRdvIONj0d8miUj4Io/DFi8TcBakN0oVtPYFvnj50Ix4MveyLLRr/5JrGku8vt5HC /+Ss0ockJRkztaNPGKMiM+br9KfX/SDVNspoHEGcubhJjhqK9gkEMGnYPpiUAXmeLrkvF8 anEhRzgwP0/dzr6iCbDU7uovWGciJHaY2bXT46mph37VtxGSEesn1lJJ4fLNC3wpbhaSrz g9RUor2Y8oYZDK/N41OSnFxW916wzhJnGImk/ZZAkX5OI9IkGVj69BirDNSvATfZEddoil gso9Japo6JWHhJfsvbQYw2dMHkSqrPAGIdRDKAC3WgbG3J82CxN+K9KINSHCOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755984320; 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=Wv/RkPRRIQnVSPQmsQmQubuGdmLgcsfogTvA0XqbKV8=; b=PuvAALyqqFshBEDbC5wzfXmrTAxGK68wJ0WwZgPrIp/jozm0o694W8C4fiPt+Bkf5ntujE 8N7RDRQJ2pM8uFL2ArmurVz3zjy6HKjTzOeG0nbifSXp8vtjmi25kn1+hL6AkwtRfQgxxT odICpGSOZ/r65uP67eWRnN7jMPD8/nUe7XARtWvqzFODDwMciFI8KZ3DOOIiMHvw5ApyC/ 0UrP5smn+Y7i3ZYyghQ6e4ngG+OF6y1hJjVm+5jyDxbQu3fm7kh4CIQNYpJ4QGJhZWNUJt 12CuNg4toF/Gh4niBDiGdEzXBX+UGJ7aEaOMCOk5Huofism67uAYTM2Pn/HkUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755984320; a=rsa-sha256; cv=none; b=p5r6RJauqMQCEsodjuHRAT7Hs7kytQ93ts0VJEcaA8//5ACnCbgszd7m0ryHbfBjQwBQZR HgkdeIuuAEr3xTYl+IUHzpa2JMjStc0zvUFgUTz+N/fLKgmipSeavoQRzzwe/KAtU0NfNF dIvylPBkfVx4dycSwk6v5a3640zgzS/oeh2y3uz0eKd2Jjl46ziUjk1hC6mSAL1alCmQt7 LSm5bKKLMW9yjKfj67Vv/YfUFKrhD9BX/mQwqLpMTMaPOUBck7JPEBTxdnKJ9tFcMMe2js kSJx5bxU7CToRrgmmSC5I5m15AMqLRRB7s5RnaQqHhRxwxaBPa+//qqgvUv9/w== 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 4c8VTD51SMzZQ2; Sat, 23 Aug 2025 21:25:20 +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 57NLPKT3098589; Sat, 23 Aug 2025 21:25:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57NLPK5i098586; Sat, 23 Aug 2025 21:25:20 GMT (envelope-from git) Date: Sat, 23 Aug 2025 21:25:20 GMT Message-Id: <202508232125.57NLPK5i098586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 2fd0083fcc23 - stable/14 - vfs_syscalls.c: Fix handling of offset args for copy_file_range 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2fd0083fcc23f4c25860b8890292448720a5961c Auto-Submitted: auto-generated The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2fd0083fcc23f4c25860b8890292448720a5961c commit 2fd0083fcc23f4c25860b8890292448720a5961c Author: Rick Macklem AuthorDate: 2025-08-09 21:15:07 +0000 Commit: Rick Macklem CommitDate: 2025-08-23 21:22:14 +0000 vfs_syscalls.c: Fix handling of offset args for copy_file_range Commit 197997a broke handling of the offset arguments to copy_file_range() when specified non-NULL. The code fails to update the offsets and, as such, a loop like: do { len = copy_file_range(infd, &inpos, outfd, &outpos, SSIZE_MAX, 0); } while (len > 0); becomes an infinite loop, just doing the same copy over and over again. This patch fixes it. The clause "(foffsets_locked || foffsets_set)" in the if is not actually needed for correctness, but I thought it made the code a little more readable and might avoid some static analyzer from throwing a "used before being set" for the savinoff and savoutoff variables. (cherry picked from commit 4046ad6bb0ee542a42d89a48a7d6a56564ed7f33) --- sys/kern/vfs_syscalls.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 37dc48c6a297..ded3a87e7f8b 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -4918,11 +4918,12 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, size_t retlen; void *rl_rcookie, *rl_wcookie; off_t inoff, outoff, savinoff, savoutoff; - bool foffsets_locked; + bool foffsets_locked, foffsets_set; infp = outfp = NULL; rl_rcookie = rl_wcookie = NULL; foffsets_locked = false; + foffsets_set = false; error = 0; retlen = 0; @@ -4990,6 +4991,8 @@ kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, } foffset_lock_pair(infp1, &inoff, outfp1, &outoff, 0); foffsets_locked = true; + } else { + foffsets_set = true; } savinoff = inoff; savoutoff = outoff; @@ -5045,11 +5048,12 @@ out: vn_rangelock_unlock(invp, rl_rcookie); if (rl_wcookie != NULL) vn_rangelock_unlock(outvp, rl_wcookie); + if ((foffsets_locked || foffsets_set) && + (error == EINTR || error == ERESTART)) { + inoff = savinoff; + outoff = savoutoff; + } if (foffsets_locked) { - if (error == EINTR || error == ERESTART) { - inoff = savinoff; - outoff = savoutoff; - } if (inoffp == NULL) foffset_unlock(infp, inoff, 0); else @@ -5058,6 +5062,9 @@ out: foffset_unlock(outfp, outoff, 0); else *outoffp = outoff; + } else if (foffsets_set) { + *inoffp = inoff; + *outoffp = outoff; } if (outfp != NULL) fdrop(outfp, td);