From nobody Tue Jul 29 22:19:51 2025 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 4bs8sg5GSRz63SlC; Tue, 29 Jul 2025 22:19:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bs8sg4Y3Cz4F50; Tue, 29 Jul 2025 22:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753827591; 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=cxlLlH09Zb4tvsnumT951YgkqEGUCifyQ0voOr4txII=; b=eqwT0n/SN0pEjX7QOhX77EwsXPfe0tUHUIDua/6FekAOYv2l8FFHvwCskwEQfQcSlpOBYJ Qrv/+wL2dhe5eqIZND//pIZV9Vq8uzsV7M3T8y9R2FoQbflRI9JUyQ43Pq0w9fyiHaOU+B 8Kj3oCHC9D/1yhQBOlJ3OQt/xLrSk1pYK6eGqq3qYEL5+l5hOVHhk8lAaTOAT7ltajcma/ C0lE5VnZLr6qX/fcH4PgpBV489Np+Z4ZNSFql7n9gOKJg9GfcYkGrCVDydCkZP6jmlt/Kc koAlDjeiY5S3Kzt4qSXXm7X47hRBYFJXLOC3eOuvOHRNPVQuaal6aL9gRhyItw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753827591; 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=cxlLlH09Zb4tvsnumT951YgkqEGUCifyQ0voOr4txII=; b=j1/FLlTgiGGNwaNTI72kVIUYw7aaHCoepnZtNsEeu3FZb21YXkRgKhqrpuZK8qyMyxcV9a 5CDJ3IbHaVwcbrFaVtm90Wni3SuaMOFtvARCKG/PZJhVRMgUlczYP+Fm5Rp45Lye4yl97b yoUaqmdlUXl1L0pUJa8ogRiHa+A5/ZUcInru3UpF8vKFOvW/MRkjZDSnmICposv507B9nG NTwWxwyoQB2cPpVx//tu9pMo3ImGEWIhcgvblPQ6Amr3B4rQcSvgMkqs6JcRz5i9WNssB/ /w7xE778j9qi9QNBYzmdkPbTEYUQwdJXQhm4xlhQjFZCo2wLDm370XYb5D7Sqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753827591; a=rsa-sha256; cv=none; b=Y3eTmGXc2L53VkLCBBDDmKI/8Kk8FW5Mkd0nd6vt5GolnVt34LpHmWZhLd15eJLys1EwPO vfK/cTlea8t5NhbA0xTESrrBKpLoI22EdzPbt3g2utEls6zN59/bkdJCfIs7c4WoeMzJZF G08QY7h4J6MR4sLgyyWTjiDZcWKo2GJEqXZqn6ivbZUQuZU2rRGrl26x6KARbuYFdgakrf ZUvs9JAVvNvk1yKCkudJaPCxJCi1jw3Wp/zcAWi3UXwpe6yGicieD3ke0BRnqw0ske8T1B w5V+qYUkRrk9Kpm3M+wuEuqYTMNNMKiBp1ZYDM41DdemuMFBodB0vGQIrG85XQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bs8sg3xGCzqN1; Tue, 29 Jul 2025 22:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56TMJpqb010295; Tue, 29 Jul 2025 22:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TMJpai010292; Tue, 29 Jul 2025 22:19:51 GMT (envelope-from git) Date: Tue, 29 Jul 2025 22:19:51 GMT Message-Id: <202507292219.56TMJpai010292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8f6769b82a2a - stable/14 - file: Fix the !CAPABILITIES build 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 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f6769b82a2a071cf07080b6d77639e919efbbcf Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8f6769b82a2a071cf07080b6d77639e919efbbcf commit 8f6769b82a2a071cf07080b6d77639e919efbbcf Author: Mark Johnston AuthorDate: 2025-06-29 16:56:59 +0000 Commit: Mark Johnston CommitDate: 2025-07-29 22:19:17 +0000 file: Fix the !CAPABILITIES build Reported by: Ian FREISLICH Fixes: f35525ff2053 ("file: Add a fd flag with O_RESOLVE_BENEATH semantics") (cherry picked from commit 6783dfb10637100067520bd6d9804e154cfee7ee) --- sys/kern/kern_descrip.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index d84c97669320..0e6af0f5deff 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2966,7 +2966,7 @@ fget_cap(struct thread *td, int fd, const cap_rights_t *needrightsp, uint8_t *flagsp, struct file **fpp, struct filecaps *havecapsp) { int error; - error = fget_unlocked(td, fd, needrightsp, flagsp, fpp); + error = fget_unlocked_flags(td, fd, needrightsp, flagsp, fpp); if (havecapsp != NULL && error == 0) filecaps_fill(havecapsp); @@ -3143,7 +3143,6 @@ fgetvp_lookup_smr(struct nameidata *ndp, struct vnode **vpp, int *flagsp) flags = fp->f_flag & FSEARCH; flags |= (fde->fde_flags & UF_RESOLVE_BENEATH) != 0 ? O_RESOLVE_BENEATH : 0; - *fsearch = ((fp->f_flag & FSEARCH) != 0); vp = fp->f_vnode; if (__predict_false(vp == NULL || vp->v_type != VDIR)) { return (EAGAIN);