From nobody Wed Jul 8 17:57:31 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 4gwQmD0pp1z6kc6L for ; Wed, 08 Jul 2026 17:57:32 +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 4gwQmC6yQ5z480f for ; Wed, 08 Jul 2026 17:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783533452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NhXRiWiixUuouC/ozOcjy5aaYIEws8jAw0Hz9O3SZLo=; b=ZWqGoEXkT7wN7Be59nthNl0g1iaDKraID6kEY83fFQliMolXGoYwnPGkRpzxceIuRZt9rp ahDG9whk6OuH49rQY7UcjAuMV8w1FoH9QEkdVx03KzD6eA+wPJGs43ODknpzVF//7/d5Fj T+iSJ0kVjKsW9vQIuEzkLvHk/lhu+bFkrriNpdulX+ivZR5umlFaOwvdJywFgHWyW2hJAJ YIV1xFtCOF0DJ9k/BbPtOEwghyyz/ckJuKO++F9j7q2ZwyN8ma12xnAlRUtkE0RALFtqhs zSL17tpmkHIHPEJ58vQNhemA9m/4A/2wFpY80fN1QQVPEoQyQytCRMaZwQiOjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783533452; a=rsa-sha256; cv=none; b=UHVpFCtawQ/6XmvCa6HAo0ljyLwJmFtVwgHpHwI8ldK+MaIlvBiprjqMRbslSUGSx5Iex7 zuuYK/+G0bNmOZRFqK8X/x/eYRuXO7E+KQXos35BmlE8cmMGB+puF7DJ7Hv/b6eVq046gu dP/ecyGYkdz4h4NohGB4id4IuZZl6H5waAzmcm8OHbAzI8RuVbr4oLOmlM8HpPdFYFdoVl vAAiL1ZLBzeBAQPl2b8xEM0UyuNtOdTrHl8/qe9Bkn3xeqKNJHh3aNkGQpef3cdyrwzepS ExnUpBTxqgF6wYpeB+Xnx7q4wJbMNl410yP7hZ5DyG/TbC5Yagr5meGe8as0yg== 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=1783533452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NhXRiWiixUuouC/ozOcjy5aaYIEws8jAw0Hz9O3SZLo=; b=glQwhO4IGRwT6QbSNmuBpNJMfcAXPlOqWXfk7sYYPXH7QNXbrhNYIJdeD1jgqht0vTOaAp NaYWVWTni1PYNL0yPx4IblFnY1HPVLmyz9HCVfDubID/hsjmZAvdLLAOZTKrdXqlgYJfKz K5z45iWpPOjTBg8JIwqWbg5hSfFGmzmxB7DsZ52M73FIOisjOOHkhZD2eQr6Z8UMCgF8oP T1gqzfONBusF0jbH3IiPT9tnGfG8t+jw2djBhBpU9wXlravY/cNtHTi7jJYEtpLm8XqB2c At5kVnVfDsf8uS2bk+L9wmwHvPNxgEhFN+sirKZaREIqGXd2qVlwHfAj3dKl8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwQmC5NplzYgN for ; Wed, 08 Jul 2026 17:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 390ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Jul 2026 17:57:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: CismonX From: Alan Somers Subject: git: ed15ec6695f3 - stable/15 - fusefs: only search for FREAD fufh in readdir 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ed15ec6695f3f6330ee1f9a0c64d22e669eb21ed Auto-Submitted: auto-generated Date: Wed, 08 Jul 2026 17:57:31 +0000 Message-Id: <6a4e8f8b.390ec.4b2da2af@gitrepo.freebsd.org> The branch stable/15 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ed15ec6695f3f6330ee1f9a0c64d22e669eb21ed commit ed15ec6695f3f6330ee1f9a0c64d22e669eb21ed Author: CismonX AuthorDate: 2025-06-20 09:41:46 +0000 Commit: Alan Somers CommitDate: 2026-07-08 17:56:50 +0000 fusefs: only search for FREAD fufh in readdir The extra search for an FEXEC fufh shall be removed, since readdir is only supposed to be called on a directory opened with FREAD. The sole exception is NFS, which will call VOP_READDIR with directories that aren't open at all. fuse already has special code to handle that. Also remove the fuse_filehandle_get_dir() function, since it's not used anywhere else. Signed-off-by: CismonX Reviewed by: asomers Pull Request: https://github.com/freebsd/freebsd-src/pull/1729 (cherry picked from commit 4179f1d9deed83977f159c8afea204293ef4c7d7) --- sys/fs/fuse/fuse_vnops.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 1923325bba19..d5404a8b9805 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -265,16 +265,6 @@ fuse_extattr_check_cred(struct vnode *vp, int ns, struct ucred *cred, } } -/* Get a filehandle for a directory */ -static int -fuse_filehandle_get_dir(struct vnode *vp, struct fuse_filehandle **fufhp, - struct ucred *cred, pid_t pid) -{ - if (fuse_filehandle_get(vp, FREAD, fufhp, cred, pid) == 0) - return 0; - return fuse_filehandle_get(vp, FEXEC, fufhp, cred, pid); -} - /* Send FUSE_FLUSH for this vnode */ static int fuse_flush(struct vnode *vp, struct ucred *cred, pid_t pid, int fflag) @@ -1980,7 +1970,7 @@ fuse_vnop_readdir(struct vop_readdir_args *ap) return (EXTERROR(EINVAL, "Buffer is too small")); tresid = uio->uio_resid; - err = fuse_filehandle_get_dir(vp, &fufh, cred, pid); + err = fuse_filehandle_get(vp, FREAD, &fufh, cred, pid); if (err == EBADF && mp->mnt_flag & MNT_EXPORTED) { KASSERT(!fsess_is_impl(mp, FUSE_OPENDIR), ("FUSE file systems that implement "