From nobody Tue Sep 29 15:59:13 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 4hvNCQ2Kyvz6tlGh for ; Tue, 29 Sep 2026 15:59:14 +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 4hvNCQ0CT9z4dnx for ; Tue, 29 Sep 2026 15:59:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697554; 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=wYdKAIQbN1P4PyGRH8/Q7g95VTf6Y1M/alnvfc1AV6I=; b=uwZRSnW+qYgtwIAD/4xCKsFVmuEv4MQWD1ggFqyitwXuFidfcyia2zb0rncc9PHFj7BTSs bDoCRO4+ao+EPzeJSsLSKzFPjwdW//gzvYn0eA0IDsrJMjecPNVAPASQgVwyI/ZtKezbz+ bhFBOHhj4iHqNPZGIg+mX1FvzMVCi7cujBF6+iTcEfewP5OVMcV7Ob2kZ4em4e0tABacwG JIcIvRmGESElIkqfaT65rUKZLw8fKR+D4yOcSIg5wpPvhzPW2p4BdOImY8IIVi+r0LHsda y7ah3lp0bcMg0VQ2khzAedcvPQ999sc6zsMVFg9Gpa14rIyqSUZtc1y7tX0H7Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790697554; b=mNIMAnV2+ky+AhZBEL0pXsF2STNaTJE83X9kGRAHX2GVyypf3ZYzhuuJQK6rA88r73Rhrl lrruMrF7164DtW4x3yJhuh7DUD2jBvrzTggwQFGPHMsru+E1GA6adtOlvgHp/s34XbV3Hh 3eh7K4Gyuxa67HSmEPUFOziINr/HuMGPJc3XgGVLo2yMiuhL/2bBL9kZXgeibS40lLc61T gh1xUBIzNjMP7zamYzptvQpy+zvgz1g+1gpxTnb3SZlG+4LBAMpKPE39Gd2TwFzSlV8eUi 88kqnF1o7nr34NzeMIc6wWahpRS2jMMZ0xvLdV6TmR0ik5pEdl5sYtd3JisG2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790697554; 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=wYdKAIQbN1P4PyGRH8/Q7g95VTf6Y1M/alnvfc1AV6I=; b=bOV+Usvm8ObpGEckSH+IZazpsZNp5ZWYNT0gJ9sUf/bwrY9KpBBmYly5upexIBlNW5u5yY OyiOZV32N4v4uQVYHxXeXIUTnZidPc1RpkRff2kpb8axrDdgS1z3Dkyz6s5os6THd/f2t5 mbBJJPIt19CTrDN3cZKdawj82/fv3c6UE4o8B01yKXFs456ec3Ngmn+CJs6wRYSnBWz5C9 L4KdqgDBR7T42+cmC+JUf//gh+lkUGN0aeUptdLah7LNDDsgR1yKzCRW9Czj/rnr5nSK9H HyeevUau6iP8qLL9pN5W3t/RTKldK+H7uZa2JNuRKwr9Q1mxdfl/oamSutFMog== 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 4hvNCP6Q5fz1JbC for ; Tue, 29 Sep 2026 15:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a62 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 15:59:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e147886becfa - releng/15.0 - file: Add a helper function to check whether filecaps are full 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: e147886becface7f9477d9bf7a6fa794d8ba2a78 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 15:59:13 +0000 Message-Id: <6abbe051.24a62.6561cc6e@gitrepo.freebsd.org> The branch releng/15.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e147886becface7f9477d9bf7a6fa794d8ba2a78 commit e147886becface7f9477d9bf7a6fa794d8ba2a78 Author: Mark Johnston AuthorDate: 2026-09-28 14:42:29 +0000 Commit: Mark Johnston CommitDate: 2026-09-28 18:14:40 +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 057235574eb5..2dfe7b445099 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1930,6 +1930,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) { @@ -3205,10 +3215,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 @@ -3310,10 +3317,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 0a388c90de26..eea96350e6e1 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -242,6 +242,7 @@ bool filecaps_copy(const struct filecaps *src, struct filecaps *dst, bool locked); void filecaps_move(struct filecaps *src, struct filecaps *dst); 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);