From nobody Tue Nov 03 09:02:02 2026 X-Original-To: dev-commits-src-branches@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 4jJjHt3RJwz6yPv6 for ; Tue, 03 Nov 2026 09:02: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjHt1vJXz4Jws for ; Tue, 03 Nov 2026 09:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696522; 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=IDmquBFhVPIMKnZH58cbIxxeqV2OYVdO9SKbYQ4UHP8=; b=nPIw0wlpr8lROftwdmyCQRoqJ5itYPhUv8uW8Y6IEE5DG4edFh8H7SKsbl6gDo+Ak9dna/ 2qYE7URADX679ptil1KMljWMMONtLaPrt2kB35LH/XhEZPFnpbVUX0r0bOrCbFPN7liUlo 0GpMSKaLEral/Jk781zmZTYNCPU1nCbL+p1A4QysZ1nhCv/6vgVjkpu4gavxy+BIpejpbn aOvlvN/DSEvtqFFvek95gFi4x7yl8VuSmT0TZORndFsTRIjKgJRiUnUfKHQjiNylCJliUl hvpcAM/N4i74kE/+GngiHgYDCVkI6sGjIHYxv/OZKZEcmsvp9elaQuWt8Gfgig== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696522; b=Ym46Rp/jO9d9281h2695AlGH8N1LI+pa82fsF/PXfireqOMJVtJtSXiucG2ukpSUgLA57X TdKFfRYDkb67+BqP+DaHxUAFNntE5mTeaN/n0VA5aFhnwF8VfG2ACioCscXzU+RFXG3gg4 pQZ5cEkTlqA4cFPCgIBdEKtZobbUzWWkKa1hyPwIppRz5GNbX0eoEAubDvJRG3iAABGvAm OVaDCtju6nU5ppPpgQfjfnsHIvPuk7wIN6LVp+bNRYjdwajGcpnyelGxSbfghQRZ7u2d13 zNa+mLOp66zis2zm7jllaiL2cgzP0wMouYLzl+jVHFssvFj+J/W4Pm/AlyyLQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696522; 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=IDmquBFhVPIMKnZH58cbIxxeqV2OYVdO9SKbYQ4UHP8=; b=YyMuSktsCV8LgDfJ8l59ALLuO1DJjOOTjuzI368Q0/5Z4j61LIO8tr8cLXQgcix/gV4zga ltzNySvkjhbJS1yCPsvF8wJDimd2lFqtQk/E43S9IQ2Q/yp/VjfCKxihvtCDqPbmRiHJ85 2KqETSaL//SKWCbszfEYQd5BuvQ5wU4tOPyic4amX8EpmvVG06RCdw6OlsO+Ov7j6pNDal g3M0OtPwruMwag9DoETGWUoIYL1m5a2sT2OK2Wc5tpGRVZ4mbzpyvrOp5oh4a91obC0lsW rY8cDOJzPBqYyOWJiuWCJ6P2UX4TRsUS+yAlR8C7yjUeY0hslr+aU6Fqj7aUkA== 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 4jJjHt1Z0cz1NjR for ; Tue, 03 Nov 2026 09:02:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d9d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4d7f2bc4142f - stable/15 - fdcopy(): properly update fd_freefile when skipping non-copyable fd List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d7f2bc4142f5feac9d0e4302b433af0392e9e24 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:02 +0000 Message-Id: <6ae9a30a.44d9d.67334826@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4d7f2bc4142f5feac9d0e4302b433af0392e9e24 commit 4d7f2bc4142f5feac9d0e4302b433af0392e9e24 Author: Konstantin Belousov AuthorDate: 2026-10-30 16:02:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:13 +0000 fdcopy(): properly update fd_freefile when skipping non-copyable fd PR: 300234 (cherry picked from commit 99a58803f9a306253df36c82f11991bc1e36e5a5) --- sys/kern/kern_descrip.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 90e0a5c8d2e0..764368b36cd3 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2616,13 +2616,16 @@ fdcopy(struct filedesc *fdp, struct proc *p1) if ((ops->fo_flags & DFLAG_FORK) != 0 && (ofde->fde_flags & UF_FOCLOSE) == 0) { if (ops->fo_fork(newfdp, ofde->fde_file, &fp, p1, - curthread) != 0) + curthread) != 0) { + if (newfdp->fd_freefile > i) + newfdp->fd_freefile = i; continue; + } fork_pass = true; } else if ((ops->fo_flags & DFLAG_PASSABLE) == 0 || (ofde->fde_flags & UF_FOCLOSE) != 0 || !fhold(ofde->fde_file)) { - if (newfdp->fd_freefile == fdp->fd_freefile) + if (newfdp->fd_freefile > i) newfdp->fd_freefile = i; continue; }