From nobody Tue Jul 7 23:28:19 2026 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 4gvy8T1whcz6kCKq for ; Tue, 07 Jul 2026 23:28:25 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvy8T0JGJz3FLk for ; Tue, 07 Jul 2026 23:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783466905; 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=1Rf6KZPF5EwL2W1yWt53nKNKjJIQvhj0k0rieS3yoG8=; b=EE5m+sSAQtiDoKta/Hs8srW38i2+VJ5Ud1iRbLwJ4Lx8Nwo3CERgdAWP5A6+rE3TEm1zzu gnji4zfpihvJ0v7elnHjizyhVJ2DAHQf/oi8hVNOFU4GdS3dtoNOZeLfp9bPYk2JsmLFpR MfyhG8yxJkWpyydFnMrp9q8zO3i94FfP4X4tbtwy5D3207MP+PlgKnrVsPuMmJtNE6D8rJ s40GFV+vaQRKVIH360q19R5fOd/tL6/0xQMIzVbjNTtuelu1oWJpFveIrQ17ZnayXxtuTB WPn0r3wTr1tOYraRIat3TIxXdZodUMhi0BZkLTYNIa8vAxg8BVge5OPi+R5trA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783466905; a=rsa-sha256; cv=none; b=UPFczvZEUIVxets3foh5ts1He/mvsrrVT+pTE90r3Qi0NKitjGSq2H+7qX7sijkl65dpzz tZqUa3CziTbx74QfwGwzbgxvyjWXYwRVlONWRqGYAdhMfBfI9rcH81GWBhGEm0lTz4S1iQ oPeZPi5vDKDyYlJQYCfmdfUPBoaWo9MKzTj/2wj6VlQOh0ueVPRUqJ5YECsVbZUTagWFXa ViViP01DYVn4QlSrNE+lzAUtXcd5626wEyDIZSEkXlSZfjxnS5ia1lZD1hSMvh1EUXKZqQ woZYsVwLIA9gGIBBTEKsEVAMvGPIKaM7kGuz3rSJLh767fykq3QJ32L0wJr8GQ== 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=1783466905; 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=1Rf6KZPF5EwL2W1yWt53nKNKjJIQvhj0k0rieS3yoG8=; b=jOlXD6fFh9MoDTDkp4zZP2W4ETuGsVh2qx1q/KpHJrb5Y76fyy9lQ0GXZ7b99ol1WyFta+ vwitAL3pYsotO5zwIUJiXHtckuW/tbWG2MzcL1hHU8L7xT5g0LXmR/5q6A5xRFjaFrdtAa /BbxPFwK2MDJ2xzv95CjEWgVKxhW+vbh6bw/LL6IK1lNIR6EJ3kanmFWbTjkMLpdG72HwD RuOZLk1yz8/SV36w437NHuNcMqAmQken1AgMtO8N36h0Gs+MUNPvWnpzjjNxhdVJ8pe6jG lACAeokK5UZZ+2ZZZcEjGwvWgmnO4pHahqFZBolxPsiIug18+q4/hgkPa8v2gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvy8S6LBvzw5H for ; Tue, 07 Jul 2026 23:28:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 307d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Jul 2026 23:28:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 77b6adbe5e35 - main - fget_remote(): return fcaps and fde_flags if requested 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 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/main X-Git-Reftype: branch X-Git-Commit: 77b6adbe5e351d1907e14d21c49291ff40ba879a Auto-Submitted: auto-generated Date: Tue, 07 Jul 2026 23:28:19 +0000 Message-Id: <6a4d8b93.307d2.42d5f42@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=77b6adbe5e351d1907e14d21c49291ff40ba879a commit 77b6adbe5e351d1907e14d21c49291ff40ba879a Author: Konstantin Belousov AuthorDate: 2026-05-23 07:03:17 +0000 Commit: Konstantin Belousov CommitDate: 2026-07-07 21:54:35 +0000 fget_remote(): return fcaps and fde_flags if requested Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57163 --- 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 349ebb5702a5..351cc1917b04 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3156,13 +3156,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); @@ -3175,6 +3182,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; @@ -3215,7 +3228,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 01bd22fbefd1..fa7f8bf7cdb7 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -3355,7 +3355,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 07b98613e087..079bd7b347d7 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -2204,9 +2204,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 a5125d0559b1..abe211aaa39a 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);