From nobody Sun Aug 16 02:46:45 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 4hN0jL1kNhz6pH8h for ; Sun, 16 Aug 2026 02:46:46 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hN0jK3rZWz3f8q for ; Sun, 16 Aug 2026 02:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848405; 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=pyAUSFZdjH3VZuCcIXAay9Hd+4S6fJqKI+XJBC5klSo=; b=Ig+k+gvgLawakbQ3IOhggM4JH01R/Rylq+0bKRsspM9dbCnF0yt8JVWkUFjLn3z4tpXVyU yc4bfpb5v78fAILEa7WycjvUQQ8D05ifPwuPNVOOl/okstAbzOmUV0gkWQUNQsiFCXJCn0 jHoy/fBABNCBNklqxGhLi9VBOYBqQXAw0aK7V7ZiIk0n2q2BVOzMD9g/QeXTkravbhQNck tEs/B39GsZ0zbTUAAGMYmyWJ5+L7dhVMbKx/V54dRLXiUvZCty9z5pccyADnm85sEDOQ8d qWnHODEKMorf88GTP2oI7qTRtwHQOGv6qXC6P8h2Jw5zA0GENe4NphNwe/Ia4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848405; a=rsa-sha256; cv=none; b=LTbIkXqCgeXSgDL4OWaGtloBUa8dC8Q74/gl4t/PfwtynguN9SnOX6p3XgpZDoyV0ptkCL ZX1p34SyS/AlldOgWZwid84xN5zGlMk4hS0z+jMhHR8rDig0Gj1vKe44/vtiOW6H1qRr2K zAN0XQ/cR106vlHW8z6PP0CDASs1cQqWQ297nX6ykRmII9xHAzdvDAwlUcIji0dygpCSPu 6/iDowGdeKvoMN1Zf62xJAf2NEQvh4kdjOsEt3r93wN5NA9uhDiTHjabqCYbKFDcdyQNre YjZSaGPDiBhhfC6daDFIkKzzDUIDS2JhBTsGNNUAkiWiWDEjgptwDylp6DYIpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848405; 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=pyAUSFZdjH3VZuCcIXAay9Hd+4S6fJqKI+XJBC5klSo=; b=dmUvS8vu6EcozIanHj+vc7J7BAM2Kdiyh93aiUs53oaqH2LU/6DKeVODQbB+vq6AiXSZn8 Y71lbgkzm0c/2njPg4u5jeLEfZIzjeMt99FU5F1laG8l3oJKytgAlAVudUTk+d8de8tGAj vvTN4eINbqtPRBXe/zp0hnbWVxkA6z/r/7BCIvLkrmqtJGrtCOCaWGtV6Ge221OfpDOc4K fWw9C7hmD93YOg7TZ6lF3BvH8KqZWuiVOanDJZa2m1bNjGGjtFnJHkvLs6Ivs1Z3MgnXR/ LQMtZI3L3c4FywcbNqSF+O/GuuPHAt9maGnyvtCQ9Ry6rqCPFLsccA3ndcE7XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0jK2W6Nz18F2 for ; Sun, 16 Aug 2026 02:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4448f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:46:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9fefa628025c - stable/15 - fget_remote(): return fcaps and fde_flags if requested 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 List-Id: 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: 9fefa628025cbd0f44bab388607b61adf14167d8 Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:46:45 +0000 Message-Id: <6a812495.4448f.713ae546@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9fefa628025cbd0f44bab388607b61adf14167d8 commit 9fefa628025cbd0f44bab388607b61adf14167d8 Author: Konstantin Belousov AuthorDate: 2026-05-23 07:03:17 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:25 +0000 fget_remote(): return fcaps and fde_flags if requested (cherry picked from commit 77b6adbe5e351d1907e14d21c49291ff40ba879a) --- sys/kern/kern_descrip.c | 19 ++++++++++++++++--- sys/kern/kern_event.c | 2 +- sys/kern/sys_generic.c | 4 ++-- sys/sys/file.h | 3 ++- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index ec9fbdae2fa7..b10b7f4f90bb 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3128,13 +3128,20 @@ fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, #endif int -fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp) +fget_remote(struct thread *td, struct proc *p, int fd, struct filecaps *fcaps, + uint8_t *fd_flags, struct file **fpp) { struct filedesc *fdp; struct file *fp; int error; - if (p == td->td_proc) /* curproc */ + /* + * Both fcaps and fd_flags must be either requested together, + * or not at all. + */ + MPASS((!(fcaps == NULL) ^ (fd_flags == NULL))); + + if (p == td->td_proc && fcaps == NULL) /* curproc */ return (fget_unlocked(td, fd, &cap_no_rights, fpp)); PROC_LOCK(p); @@ -3147,6 +3154,12 @@ fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp) fp = fget_noref(fdp, fd); if (fp != NULL && fhold(fp)) { *fpp = fp; + if (fd_flags != NULL) { + *fd_flags = fde_to_fd_flags(fdp->fd_ofiles[fd]. + fde_flags); + } + if (fcaps != NULL) + *fcaps = fdp->fd_ofiles[fd].fde_caps; error = 0; } else { error = EBADF; @@ -3187,7 +3200,7 @@ fget_remote_foreach(struct thread *td, struct proc *p, } for (fd = 0; fd <= highfd; fd++) { - error1 = fget_remote(td, p, fd, &fp); + error1 = fget_remote(td, p, fd, NULL, NULL, &fp); if (error1 != 0) continue; error = fn(p, fd, fp, arg); diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 62c449e59f68..456eddfaea9f 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3391,7 +3391,7 @@ sysctl_kern_proc_kqueue_one(struct thread *td, struct sbuf *s, struct proc *p, struct kqueue *kq; int error; - error = fget_remote(td, p, kq_fd, &fp); + error = fget_remote(td, p, kq_fd, NULL, NULL, &fp); if (error == 0) { if (fp->f_type != DTYPE_KQUEUE) { error = EINVAL; diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index b829a70f26aa..c6aa06e62be6 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -2208,9 +2208,9 @@ kern_kcmp(struct thread *td, pid_t pid1, pid_t pid2, int type, switch (type) { case KCMP_FILE: case KCMP_FILEOBJ: - error = fget_remote(td, p1, idx1, &fp1); + error = fget_remote(td, p1, idx1, NULL, NULL, &fp1); if (error == 0) { - error = fget_remote(td, p2, idx2, &fp2); + error = fget_remote(td, p2, idx2, NULL, NULL, &fp2); if (error == 0) { if (type == KCMP_FILEOBJ) res = fo_cmp(fp1, fp2, td); diff --git a/sys/sys/file.h b/sys/sys/file.h index bc529df82048..055e6b38483d 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -283,7 +283,8 @@ int fget_write(struct thread *td, int fd, const cap_rights_t *rightsp, int fget_fcntl(struct thread *td, int fd, const cap_rights_t *rightsp, int needfcntl, struct file **fpp); int _fdrop(struct file *fp, struct thread *td); -int fget_remote(struct thread *td, struct proc *p, int fd, struct file **fpp); +int fget_remote(struct thread *td, struct proc *p, int fd, + struct filecaps *fcaps, uint8_t *fd_flags, struct file **fpp); int fget_remote_foreach(struct thread *td, struct proc *p, int (*fn)(struct proc *, int, struct file *, void *), void *arg);