From nobody Mon Aug 18 13:30:34 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 4c5D9l48MDz63gwW; Mon, 18 Aug 2025 13:30:35 +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 4c5D9l0xchz3w9Y; Mon, 18 Aug 2025 13:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523835; 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=S/rZzAJ9f99N1b2dDysamiPKvZ0tuubNE5BlnxvnYQ0=; b=sDz60n63D0B0gFCvqZ6OeA56q/wibQGaHdCdXBsbcxUqD5hAXPfZgidWglGXfoVeelM8lx 7zDn9iosHpAxwm1e/o5azCUKVU0EbacVoZwsSUgOXfxCemDLm2h17u2GPDiOxK5CbviXJS 0y+GKUQ2k38YadU5NgWzlCQaeGxMHwtdJ7rPCOPsH6Dd68+HolqCE0eFnc/kI+s+j7VJY5 HWB0xIaaq+qArq3Q5E8WSEKkY3MYz0Xu7zWheKSiKCPBSpfktcS6x1gzg/e0Wk8C65Ck3/ CsCwAm0Jpy7KkbwM2fJWXWDMI64HcgjIqDUBNwh8zJ90d75Bm4BO+n9NpySaqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755523835; 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=S/rZzAJ9f99N1b2dDysamiPKvZ0tuubNE5BlnxvnYQ0=; b=aGNMjL8lxu9n9YyTsmEu2ufSRxqOwd73TzJcEjrqAjw/CuE0DzbDIr8aD0wejY9vUCw76y N7cOulLPiFSZejeor2SpTkht4COeMKQ59DQpm2AydNMy0oau1N1ijP50cJHLiv6uygijjh k7mQZBkh8ayhVbec4o9fvOG1mo3qoPn12pE84qNW/YM/NNWMgpa966sFDOcM6RQl49Dzcc HTCAFilgmCGcLTD5V7fyKNmUBwXMMLekaAxxypRyTIGG01uPdAlvW/UFdLeSHrYcbdW0CK qksiqxoL7TbjKb8FStvQxWWHib2EZ481rMbhFv3b4qddwi5vS5oVpCRHZWvrmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755523835; a=rsa-sha256; cv=none; b=Hq6RyTp02q5wcFc40j9CkRvzFxqdC84hhvjKCwnXZa9tca915YuQ//cGR11FBSD10BV1p1 j+vcXMbK66b+M6vjTJvzTyQEfdjfVtNw0odfUbLNAvftXT/DqU0IAtxCl6OmqvryJrgfcV U4QkqhGUzyCbCy5eb+/3C1iWJ1rvzK+vT+yyXn5hnlAaxdczrYGkd681iGvG/VRLizk0Zh rQl46da8I9QKzpWpcHbNs7vh2eHwOJuStPiPaCTV4B6tXkGqC7XUR3j/VWMgyr9lg7iMjd zNnE14CaXA1mvMHol4lOysgCBUXpOMGM5C0rpeWt8+7YgnQIJnLl4Bduw9EkiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c5D9l0QGXzyG9; Mon, 18 Aug 2025 13:30:35 +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 57IDUYRD042275; Mon, 18 Aug 2025 13:30:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57IDUYpg042272; Mon, 18 Aug 2025 13:30:34 GMT (envelope-from git) Date: Mon, 18 Aug 2025 13:30:34 GMT Message-Id: <202508181330.57IDUYpg042272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cead6157cc1b - main - zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cead6157cc1b748df29b32072f492d4f6afae65a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cead6157cc1b748df29b32072f492d4f6afae65a commit cead6157cc1b748df29b32072f492d4f6afae65a Author: Konstantin Belousov AuthorDate: 2025-08-16 02:40:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-18 13:29:54 +0000 zfsctl_root_readdir: if there were no dirents to copy out, return EINVAL same as UFS. Reviewed by: allanjude, markj, rmacklem Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D51930 --- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 40 ++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 4de48e013ec4..a222c5de4a2a 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -674,6 +674,7 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; + ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); @@ -693,13 +694,11 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) return (0); } + orig_resid = zfs_uio_resid(&uio); error = sfs_readdir_common(zfsvfs->z_root, ZFSCTL_INO_ROOT, ap, &uio, &dots_offset); - if (error != 0) { - if (error == ENAMETOOLONG) /* ran out of destination space */ - error = 0; - return (error); - } + if (error != 0) + goto err; if (zfs_uio_offset(&uio) != dots_offset) return (SET_ERROR(EINVAL)); @@ -712,8 +711,11 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { - if (error == ENAMETOOLONG) - error = 0; +err: + if (error == ENAMETOOLONG) { + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } return (SET_ERROR(error)); } if (eofp != NULL) @@ -1058,17 +1060,21 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) zfs_uio_t uio; int *eofp = ap->a_eofflag; off_t dots_offset; + ssize_t orig_resid; int error; zfs_uio_init(&uio, ap->a_uio); + orig_resid = zfs_uio_resid(&uio); ASSERT3S(vp->v_type, ==, VDIR); error = sfs_readdir_common(ZFSCTL_INO_ROOT, ZFSCTL_INO_SNAPDIR, ap, &uio, &dots_offset); if (error != 0) { - if (error == ENAMETOOLONG) /* ran out of destination space */ - error = 0; + if (error == ENAMETOOLONG) { /* ran out of destination space */ + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } return (error); } @@ -1086,9 +1092,13 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) dsl_pool_config_exit(dmu_objset_pool(zfsvfs->z_os), FTAG); if (error != 0) { if (error == ENOENT) { - if (eofp != NULL) - *eofp = 1; - error = 0; + if (orig_resid == zfs_uio_resid(&uio)) { + error = EINVAL; + } else { + error = 0; + if (eofp != NULL) + *eofp = 1; + } } zfs_exit(zfsvfs, FTAG); return (error); @@ -1101,8 +1111,10 @@ zfsctl_snapdir_readdir(struct vop_readdir_args *ap) entry.d_reclen = sizeof (entry); error = vfs_read_dirent(ap, &entry, zfs_uio_offset(&uio)); if (error != 0) { - if (error == ENAMETOOLONG) - error = 0; + if (error == ENAMETOOLONG) { + error = orig_resid == zfs_uio_resid(&uio) ? + EINVAL : 0; + } zfs_exit(zfsvfs, FTAG); return (SET_ERROR(error)); }