From nobody Sat Oct 18 05:14:09 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 4cpVGp1LYjz6CQDL; Sat, 18 Oct 2025 05:14:10 +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 4cpVGp06xzz3VCV; Sat, 18 Oct 2025 05:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760764450; 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=VnIKOtLGACbnBK+a8szoqWF/bjHkIDzreUwlNadhlMY=; b=qUC4/NVdS27UQD72vyniig75KcUmB0gfeTer9m373u+JmDDtrGDGGW7U+8HhGOOuECAWYo Ld7d4cOHDtA1WdkrHT3anb1eUmvYmwxz299CSlnCiRRnQcUV/+6sPw+pk7wFALsmSOerLP 7KucAA0Kh6cfgxkrbVNf57Kld6AoCtG2SUSh4FidhWT6sChknPTGsfv7NHQnhsWm5nC42P klYBKosUIN4bgYWmUAVw/oafpDzpyFMqz+kMP6njwYZvQtMGIbRPVn2NI5poX5GrXY/1CL q5G6FuQq0tBTFhiIBVcMJ4hbQEOaz1aguYKYx7dWJnXvN5CzRPl1CbPp8J0MeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760764450; 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=VnIKOtLGACbnBK+a8szoqWF/bjHkIDzreUwlNadhlMY=; b=p2XqsBqjAdT/43Cqrayfyqe3XhfSjduz4ni5ptwejasG4ByDXckub99WxJFvDq+yWo+L83 iWcmUWRfkJl+4qWmCEUFnUv6j33O/rcy47OBTrqLptULt8zL9UxCOOm8P9tvUQhvMdk2P8 FZ690rPJ4FVWzuoPnhAbBFwUMCbD2i2r09BQhdtqt/rL8EGOcZUxO+M3JHsuzPiTrwdBOh 2sY5h4os6zsZWrUq3O+4ZonLKeYjElKTzbg5SkAm6X0RtKhCzxYNtjpuGpUqG59CWWmJJ+ PJ6bIqmjD+oHJ0VZE7wu3W348ZVtXSmAv1Denw4VXymq27GqqJSUBs/zcUDaXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760764450; a=rsa-sha256; cv=none; b=JdmLN8A/L+PSOj0Ztx8+96iBfx8WPsqc81odvyfbVQnb5ToS87vUgSvghD8B2X+baVxWiP 3wOGRXRhFZ+ixuZQL1MBTVOHwmCWgGMcJywU5evSjZ0zWZc0w6ZUP15faMiF+LwsCo/HX2 qPt2O8N4uALNpxLtZVic76JUgxnQJJHI2oMd2bS5c+eZg1Fp10gb+Jb2rDCbVLi8fCuzHU COXJLzTSRLxzDGIJb8gDwZDsUwRyJioZkjRXHnVwuKODd7GHirH2T3ac/LG7IxbjFh8L76 PTpQMMwObdswKqww59NEItqMlvuvol4WGaJQl+Kx3aL5+zZunfUCfo/katikaA== 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 4cpVGn6r6XzBpP; Sat, 18 Oct 2025 05:14:09 +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 59I5E9uI062301; Sat, 18 Oct 2025 05:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59I5E9vh062298; Sat, 18 Oct 2025 05:14:09 GMT (envelope-from git) Date: Sat, 18 Oct 2025 05:14:09 GMT Message-Id: <202510180514.59I5E9vh062298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 37ce6052f6ac - main - kern_descrip.c: add struct proc argument to fdcopy() 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37ce6052f6ac5064c5a982beed7393109111dd10 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=37ce6052f6ac5064c5a982beed7393109111dd10 commit 37ce6052f6ac5064c5a982beed7393109111dd10 Author: Konstantin Belousov AuthorDate: 2025-08-20 19:02:33 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-18 05:12:36 +0000 kern_descrip.c: add struct proc argument to fdcopy() The proc is the owner of the copied filedesc. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D52045 --- sys/kern/kern_descrip.c | 4 ++-- sys/kern/kern_fork.c | 2 +- sys/sys/filedesc.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 373542d16285..a71a601733e5 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2486,7 +2486,7 @@ fdunshare(struct thread *td) if (refcount_load(&p->p_fd->fd_refcnt) == 1) return; - tmp = fdcopy(p->p_fd); + tmp = fdcopy(p->p_fd, p); fdescfree(td); p->p_fd = tmp; } @@ -2515,7 +2515,7 @@ pdunshare(struct thread *td) * this is to ease callers, not catch errors. */ struct filedesc * -fdcopy(struct filedesc *fdp) +fdcopy(struct filedesc *fdp, struct proc *p1) { struct filedesc *newfdp; struct filedescent *nfde, *ofde; diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 7f6abae187b3..8b237b6dbd17 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -423,7 +423,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * pd = pdshare(p1->p_pd); else pd = pdcopy(p1->p_pd); - fd = fdcopy(p1->p_fd); + fd = fdcopy(p1->p_fd, p2); fdtol = NULL; } else { if (fr->fr_flags2 & FR2_SHARE_PATHS) diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 0a388c90de26..4817855443af 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -265,7 +265,7 @@ int fdcheckstd(struct thread *td); void fdclose(struct thread *td, struct file *fp, int idx); void fdcloseexec(struct thread *td); void fdsetugidsafety(struct thread *td); -struct filedesc *fdcopy(struct filedesc *fdp); +struct filedesc *fdcopy(struct filedesc *fdp, struct proc *p1); void fdunshare(struct thread *td); void fdescfree(struct thread *td); int fdlastfile(struct filedesc *fdp);