From nobody Tue Jul 29 12:49:17 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 4brwCL0yT7z62xWJ; Tue, 29 Jul 2025 12:49:18 +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 4brwCK3bqYz3lg9; Tue, 29 Jul 2025 12:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793357; 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=98uWn30uJp77OTibe0MldIYmCTjATri++HOdbh8LtOA=; b=KCzPw5BMWW0SyUg2mH+7FMp1hgnwDCFvZWRcsb42hS55wIdxSK/S2EMoapdLcv2f/r8z5X oTyhtb/nmeXd2SPlxb708KHqDm+ZUrPoc/mumeLv9iMYzJAWmgYv0l2wKXFfFLtPfPTgAB PAPagkwf4vGbnCFuYKXUnpcwOzfLO6ZM2ywWSuZ4371r04j7/AdhONE9OiOHMRh5oNPuyy ZnbFHAAy/MSvGx/ihApVifH7Q4B62Iw8zEZIA8oG+9Q6P2SxEqzrZeBl7np6YH5D/hvNcw J0dqA9doMbjo3efAC08JW69+99P/2qqf/gqlXVGYvZ/82QUiwt/LBgGOgDUg7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793357; 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=98uWn30uJp77OTibe0MldIYmCTjATri++HOdbh8LtOA=; b=OjnC/q5U8gpdSwvsweVg2gveVBn7j2PxAtX5NMA73A3Ija2KAPmUvzFB1Axj0Z8Dx45ABU EvZXsFbMC5kIVMPcVgR3g2bE/qIYqrxHWdT2m19Nj0fijKVbs0BgYel0Se8sQJltoB5rJ7 rvu8aklCp75uSWCqYeHWcG9HSZm1wAnXFPIhEYWymwPDHFrAYNG4J5H9wNh3qa6LVvb7a6 /Rkc6YnHqZvc7i9NTLGjmpVAMoRXyvdCv6DDGL4Yz5cO/XYjapzM4DDSL0jgMojK09ScQu hj1EF1ZQp9vZFfKMMfbaTsc2/1z8BpyWWIAjELHLO5G19sGepfkRin3u2OwEFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753793357; a=rsa-sha256; cv=none; b=EpqfFR1qUJMeto0tzqd7kQnOInCbWIvMtGf+mUJUSFWW5Owc/UrYKC/T5saz8SX//Y5C1y JlG22boN8IsTDO0dKWJTY1co3kHzG1m4CeVSm7Hjqkh3yz1ndb8eaNDB7JTW4fK87dekoa zv8gnfdpFkc1CFmmwU2EY2KQnujxvzm4FqrzoGoNYd+hqVqvFptzM9SD8Ro6/HRIIdifXj bYKuMUcvaG7SNVaMAVkA8LCQFmsOdHRzDo/GwbLunW3D/81gpjz06wc02NZk8Pm8g+DjyI i8j95BtuFQlfSa1kW/PsyoCOAJUVvaSitLLli6YN+W+2gMIcs8GvY5MxXLs99Q== 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 4brwCK39HXzY1p; Tue, 29 Jul 2025 12:49:17 +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 56TCnHSw033769; Tue, 29 Jul 2025 12:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TCnHdx033766; Tue, 29 Jul 2025 12:49:17 GMT (envelope-from git) Date: Tue, 29 Jul 2025 12:49:17 GMT Message-Id: <202507291249.56TCnHdx033766@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: d8ef477a7bfe - stable/14 - fdescfs: Set *eofflag in fdesc_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 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: d8ef477a7bfeed988561ad5a224878b24ee65352 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8ef477a7bfeed988561ad5a224878b24ee65352 commit d8ef477a7bfeed988561ad5a224878b24ee65352 Author: Mark Johnston AuthorDate: 2025-07-15 00:38:21 +0000 Commit: Mark Johnston CommitDate: 2025-07-29 12:08:54 +0000 fdescfs: Set *eofflag in fdesc_readdir() Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51319 (cherry picked from commit da84054f3a508ceab4474e4a002c87813963cc84) --- sys/fs/fdescfs/fdesc_vnops.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 47fb387a007e..f4b3eba91ef3 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -549,6 +549,8 @@ fdesc_readdir(struct vop_readdir_args *ap) fmp = VFSTOFDESC(ap->a_vp->v_mount); if (ap->a_ncookies != NULL) *ap->a_ncookies = 0; + if (ap->a_eofflag != NULL) + *ap->a_eofflag = 0; off = (int)uio->uio_offset; if (off != uio->uio_offset || off < 0 || (u_int)off % UIO_MX != 0 || @@ -561,7 +563,12 @@ fdesc_readdir(struct vop_readdir_args *ap) fcnt = i - 2; /* The first two nodes are `.' and `..' */ FILEDESC_SLOCK(fdp); - while (i < fdp->fd_nfiles + 2 && uio->uio_resid >= UIO_MX) { + while (uio->uio_resid >= UIO_MX) { + if (i >= fdp->fd_nfiles + 2) { + if (ap->a_eofflag != NULL) + *ap->a_eofflag = 1; + break; + } bzero((caddr_t)dp, UIO_MX); switch (i) { case 0: /* `.' */