From nobody Sat Nov 01 00:45:02 2025 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 4cyzdq1t4cz6FWVp; Sat, 01 Nov 2025 00:45:03 +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 4cyzdq17XQz3hB6; Sat, 01 Nov 2025 00:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761957903; 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=k5pbiw8LUpbNyU+UMjdYmZ5zWZ5HFHvp/eWBCxzxyFE=; b=AzvtUz6ZW/+fksymxJP9tk4SS/l4SjcPs/PfKxlTrkcwkT9LYhU9K1wNHpiLZC0Q11zF3Q 7NBA5IfgioZbcxQkHdA2wg3+hSUwK23Uxjd/XrJFl/IGCdRzj5w9uZwPNIo5wiG+Cn1opr DjoJzNkG1HBGWe7nWrgCMNme3G3KQI2U82BuVqwr/3s9ycGw44RNclU/071eCvlbG2S2Ur 3R5RclEzbTxdL1x/2KHp6YRqWGRj6J5jStRWoSvMdLR1cIE7pOSDGlwenjUL6sTmm1RQvi il35pwZFGRkGe8k4CjHtOQ1zqoWED++hfCxtjEHFW9hVqihKRpaWLqdq6d6gEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761957903; 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=k5pbiw8LUpbNyU+UMjdYmZ5zWZ5HFHvp/eWBCxzxyFE=; b=yN0i5//RLAFLvpyObSpcKu561kIuOFvU6b01kDZPGP6izH762sE/AbQ4wM5Scnfd2M7hrx gpA8VHYH/duxuXxP54bg1AXjZn34GQbTAKJ1Z84PWfbJ0noOXNHdUpXiE41ncCk185T2z8 kxKdPUdPsq1CUB+jpk9Nvpteum5UO6IeTAcIz3GhDBRUXKGurRRy4mnN08hkjhcL/QOtTS Uw9lZ2WF+XhAIDUKZZgZVE6MfiGCb9ll3zsTyWqKX3zwuOafea2DvPofhP2owdnTE404a8 Cms1X2p3usCPZj4CdGKjWDzcgZKF1f8zUehaeuaf/jXSyq9wn0MePdE/nAs3Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761957903; a=rsa-sha256; cv=none; b=gv1EgxLKfgE42oUH/EIyHgs5V6boToH4u0LyyJT9KyKaxsj5uhVmMoBGe7iUxhtVYd7by4 VO+aYTB1Ip8jvKAEabUZfjzoQcQBJPL5heHlsOqDDhZ6WBuxoz8zC6ERPmsBkR4h/gfDyg XDDAPCxuxuu0/1HOIMpT5d3QvSYpznwNUI7YwxkHuk18MgevKNJb52dJQBhMrLZaETHNr3 l0rmKbMZmQLFcybKlWbFfqAHfw1sguXawMVckR564/RtOoP+DXoOU0jpxggh8B2Woz3qJy +hSxECsWe41AvB4ClblfV/f3L1fWPjMo/dOG9bYPLq18QtSlbGUUW9PyuZCRxA== 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 4cyzdq0W6pz13c; Sat, 01 Nov 2025 00:45:03 +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 5A10j2GN000705; Sat, 1 Nov 2025 00:45:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A10j2sY000702; Sat, 1 Nov 2025 00:45:02 GMT (envelope-from git) Date: Sat, 1 Nov 2025 00:45:02 GMT Message-Id: <202511010045.5A10j2sY000702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 23d4dd1d53bf - stable/15 - kern_descrip.c: add struct proc argument to fdcopy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 23d4dd1d53bf1c74929f7b1f19cf7830d9e43fba Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=23d4dd1d53bf1c74929f7b1f19cf7830d9e43fba commit 23d4dd1d53bf1c74929f7b1f19cf7830d9e43fba Author: Konstantin Belousov AuthorDate: 2025-08-20 19:02:33 +0000 Commit: Konstantin Belousov CommitDate: 2025-11-01 00:43:13 +0000 kern_descrip.c: add struct proc argument to fdcopy() (cherry picked from commit 37ce6052f6ac5064c5a982beed7393109111dd10) --- 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 6934a5a83081..58b048d780f1 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2477,7 +2477,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; } @@ -2506,7 +2506,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 2ab9b363f8b5..599ea374ee8c 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);