From nobody Tue Sep 29 16:09:05 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 4hvNQp1xYmz6tlqH for ; Tue, 29 Sep 2026 16:09:06 +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 4hvNQp0stvz4r4H for ; Tue, 29 Sep 2026 16:09:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698146; 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=rw9QCt3P2Gnnu3akvvaUujOKERymmytAbbKLiXbt5/s=; b=dbWiR3eaYGAnqlc17ZHB2irCGmKXZPl8f0mdHDIBMS0BG1uFtsJpvXirp87QgZYimcOpXB O/SMZj9eCPs+kGHgVQUQzniXr8KzHa7cA62USjrfhlM6uf/74LS2G6s5N5rNaYHVfpUeUe GY+5JR8b0YPvRnta3DCVsNxIN0ks0+7JCGJc4HW/kaCrxu3Mgb2AxPpuAsAe5qRP0jK8ox vlJQfQFWTb+pp/TYWH9GUV0Rheq8Bn8XqrN8k4NErQzkKMIieEL93dHZLDxg13EYn2iUq2 Rmq/osOWFOI260Ag2hYQXnK94qlsqMqIrT/TBM+WvreVA2uapTiACtVWSEg4JQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790698146; b=AWtPPitvXdHzwPG5IFCxdGM71W3DIlM3foFbLO066fAO9CwpCVtikKZ3OlbOVovmf1jcwf A3g/ZOFRhdxpR3JQPVaMjA25yJtUizH8jjYV2Aqm0eO4ZRHddMYMIJ8KNTH/AuvI/agwSQ DdtN6nvDlFA1zExBxaTMAgGpwdCus0WvuJahYB1rQsLWDmstAN+hDwGKNaB9d7ijXg41qN IAEqaua4LmTLCNN0/8oZr5aNcko6B8ucIgF3aylMwz5e2E28t0iLsXxpj1Ao2JTtDxUon2 8A6t/n+5oKzus3n6Vk3xdgFrb4Nwd1+ESbS5HgGdS3QYxzYSDFpf/MF6PGe9Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698146; 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=rw9QCt3P2Gnnu3akvvaUujOKERymmytAbbKLiXbt5/s=; b=XdHZOnEHs6eeFmOaWbtSYL50rf4cBNDAd3UmTQ+0No92IKAzwW9QZZBRRhpowMlStp+3MP pl6eQVnmrq4HNEGJ3nzzQBcVeOpSyYxChO1tSYPL3W8trU3mlXkwmiVQXZjg3M0PRYq1CP oiH75N4ZG4pQFv4X6yjIPTn4j46Y/jPbNS9Bnhvpx7M8PIkTILq26mUTCG4cskThqr0Dfh /4oB3n2MghAbF8eKisehvVMof8xriZj530nhyQr+9nTbzBMi4nontya4wjewKzxhZqKJCU PikBFbHJiDDgBMeB/8rsz1zyOkTWfuGlLHTbKkGejJH/Bu3gAhoorF54EICvQQ== 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 4hvNQn6FYfz1KnX for ; Tue, 29 Sep 2026 16:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31424 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 16:09:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e024dcebb54b - releng/14.5 - 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/14.5 X-Git-Reftype: branch X-Git-Commit: e024dcebb54b77a22d935bc713a26fc49d808456 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 16:09:05 +0000 Message-Id: <6abbe2a1.31424.62d7377d@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e024dcebb54b77a22d935bc713a26fc49d808456 commit e024dcebb54b77a22d935bc713a26fc49d808456 Author: Mark Johnston AuthorDate: 2026-09-28 14:42:29 +0000 Commit: Mark Johnston CommitDate: 2026-09-28 18:20:13 +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 9980c4c9a99d..e551944b638b 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1844,6 +1844,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) { @@ -3113,10 +3123,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 @@ -3218,10 +3225,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 18077d11150d..c6d9add81a6c 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -244,6 +244,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);