From nobody Tue Sep 29 15:55:45 2026 X-Original-To: dev-commits-src-main@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 4hvN7Q18WZz6tkk7 for ; Tue, 29 Sep 2026 15:55: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 4hvN7Q0DKsz4TJh for ; Tue, 29 Sep 2026 15:55:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697346; 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=ZaM0ZO7wvV5hpMO+thpUsYQqmEOd/4t/N7T29JRd2KU=; b=Z0cPWxYd3pa7LABh4KTf3finUtb1Fd9WmWfIlXZxMOPydcNFV/P4q4T0+aVUpGjn6ajgSH I4nIWaGzctw2gnIklCNAFrKFNtnzOSV8BTB3fHi6cgwo3ZENFXE7GfF9hnAgbFcLbGcNnD fHw5p3y4/wCI66DaApWONyX/pWt+KjFtuKsoYLKkCDz3JqlnNOCZ4CT+pSnQwzReOmoMwg B3h6c22+rHHph4uQdhiTawPTGzSRZ66yWBgbIR7ovlkp3BW92BGG76mo56CC4TvnQ5A7uC 2zUbhMRHioJMs4tiJpFy098AvqSVtPAUj0qebiVk+klbidBPGcSyYZyyHGV80g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790697346; b=L2x/pSL0W5ZFJ9mnFZYs5dpJ6HaxA/XIsBOTu7U1ipo3je+aDoQhoFouaRe2RUtfSvJmVq pAR3bU+qjA7M2rFCrZGDk4jRX+8l8CdoQZlku1RGIBzBUDKRTIRzFXBEazl8qLO7mWFNo9 WVE+cJn5JX4J5/3M8ru6C/xdu3Xyf5mAlKtP4thCe48WxoMWBId0a938yG9StMh/0ulaJz I4HGMJPZxnDw471TM9r2VPmfO0Bjcgj5BCPQZ29QPgjp5PuutusEXO+EwicEJtkyDVxn1C SET47La36QHzH9s4BCXsBTfG14XI0NwCXXWGiM4O2CTLF4GUPBKseXmk3Cn/Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697346; 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=ZaM0ZO7wvV5hpMO+thpUsYQqmEOd/4t/N7T29JRd2KU=; b=uLzRpUFdMusi2duTnbTnVHhpy4v+jIvDqWKHQM4cLiYoX9Q1jgzE4iwAizYq1dv2vGTF0C bMjy9+Yvh9rJY+moV9k8PSh8svzPjkPldnO5ugfYU2jMeQkzdpPiNp+P+E4L7h8luGRLEl FFnXhD/t64tgRK9IJrYtPXAREPM9dADlDsaqmJWSgkoft6Gk8kteDyR4a8zh+d9AjgUP81 1TIvER3KsyfeMxZXMNRQfIkhwxDRnBPHJNNgpPnuiUpRvQMoVUECPKPKPoS33MAbBylLK3 qz0PDybDEspOqQIY49ivl5k3cM1S3CDQuH0AErYSATW60cIJa2Ta1kgU5YCb0w== 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 4hvN7P6PTZz1JZj for ; Tue, 29 Sep 2026 15:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 262d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 15:55:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e4a57ef30c2f - main - file: Add a helper function to check whether filecaps are full List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e4a57ef30c2f000b844e553f41e39ce46eff8cdd Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 15:55:45 +0000 Message-Id: <6abbdf81.262d9.660079b7@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4a57ef30c2f000b844e553f41e39ce46eff8cdd commit e4a57ef30c2f000b844e553f41e39ce46eff8cdd Author: Mark Johnston AuthorDate: 2026-09-28 14:42:29 +0000 Commit: Mark Johnston CommitDate: 2026-09-29 15:54:16 +0000 file: Add a helper function to check whether filecaps are full In a couple of places we want to know whether someone has limited rights on an fd. There, we want a predicate which determines whether the set of rights is smaller than CAP_ALL, and whether there are explicit ioctl or fcntl lists. Factor this out into a helper function, in preparation for use elsewhere. No functional change intended. Approved by: so Security: FreeBSD-SA-26:66.jail Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59884 --- sys/kern/kern_descrip.c | 20 ++++++++++++-------- sys/sys/filedesc.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index bb806302fd03..b169a3a677c3 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1935,6 +1935,16 @@ filecaps_free(struct filecaps *fcaps) bzero(fcaps, sizeof(*fcaps)); } +bool +filecaps_full(const struct filecaps *fcaps) +{ + cap_rights_t allrights; + + CAP_ALL(&allrights); + return (cap_rights_contains(&fcaps->fc_rights, &allrights) && + fcaps->fc_fcntls == CAP_FCNTL_ALL && fcaps->fc_nioctls == -1); +} + static u_long * filecaps_free_prep(struct filecaps *fcaps) { @@ -3302,10 +3312,7 @@ fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, int *flagsp) * * Not yet supported by fast path. */ - CAP_ALL(&rights); - if (!cap_rights_contains(&ndp->ni_filecaps.fc_rights, &rights) || - ndp->ni_filecaps.fc_fcntls != CAP_FCNTL_ALL || - ndp->ni_filecaps.fc_nioctls != -1) { + if (!filecaps_full(&ndp->ni_filecaps)) { #ifdef notyet ndp->ni_lcf |= NI_LCF_STRICTREL; #else @@ -3407,10 +3414,7 @@ fgetvp_lookup(struct nameidata *ndp, struct vnode **vpp) * all lookups relative to it must also be * strictly relative. */ - CAP_ALL(&rights); - if (!cap_rights_contains(&ndp->ni_filecaps.fc_rights, &rights) || - ndp->ni_filecaps.fc_fcntls != CAP_FCNTL_ALL || - ndp->ni_filecaps.fc_nioctls != -1) { + if (!filecaps_full(&ndp->ni_filecaps)) { ndp->ni_lcf |= NI_LCF_STRICTREL; ndp->ni_resflags |= NIRES_STRICTREL; } diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 31a3bc44d4aa..0f878e530436 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -245,6 +245,7 @@ bool filecaps_copy(const struct filecaps *src, struct filecaps *dst, void filecaps_move(struct filecaps *src, struct filecaps *dst); void filecaps_fill(struct filecaps *fcaps); void filecaps_free(struct filecaps *fcaps); +bool filecaps_full(const struct filecaps *fcaps); int closef(struct file *fp, struct thread *td); void closef_nothread(struct file *fp);