From nobody Fri Aug 8 04:18:41 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 4byrPZ3vm5z647PP; Fri, 08 Aug 2025 04:18:42 +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 4byrPZ1lBXz3PMd; Fri, 08 Aug 2025 04:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754626722; 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=gCb8Kon8EsEpTvNO05u1R7XS+nV5a5fjlpyvftqrCqQ=; b=aH8XzoT9ozKxOnVzx5J5BKCS8wTfvSDu78l02VHPvo4aqcXrQHUEBKhAIbijqCnI+EFs20 OhvSGXVxHDfFNbWINMDNUaTho7BHB15O2J22J0p1RSO6fx+tXuMWyLIziZ3zUQjjcMzUIW yAhS5MQHkmR1tK5TB74SyhdyXa45j4Dj1y8VfUCRzN6mbar1Cevoo6vOvj/+dot6tLBkb9 WqIee0OinxXHgdonWSC4AuaGXo3hN+IUp7snlgbGl3TFsVeq0EUKHlGUq8y9c2G/l4V+7u XG0Wi6eREnmVYlLhvwA8/k8MgMZcqLwJmtrZfhAGYks9Jwpkqd4c6kGtMjg3Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754626722; 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=gCb8Kon8EsEpTvNO05u1R7XS+nV5a5fjlpyvftqrCqQ=; b=o9nMDh+jB7JhzNgCaIXBjgH7QVqK+W2GMq7S7FBTQdAYXF+ERO/D04vI5nMquwE5BH/HxK NqN27HPJiNraAftvg8RXbGEL7UA2NqGMMurxnKHxx/yH3/7TtyIjTuNaWFnZEBujfapHlR gO/Ozku+LUyfvn9uqJxqARzDqiZY7trfMtfHhsHM6w1O6uwn8pONwzYaV3YYDSCV0clgtd Qplmm6WkeOwgC4g+c+Npu0+M+AUJPqeOvKDsuYQdOJE3URqY2s7R5XWeR+hHmFvBlNgooA R5uOFY+JCJ0Qfu3EsgqaPQowIRtGTam8K37AroKfnpXKKd/YjoJXhKjcAT0dYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754626722; a=rsa-sha256; cv=none; b=yLHbeyHKKaL/mMyReMqZUJ3878OOiOxG6kRbKUAuv18N8yX0+Kx1iutDswXjHlBzD94fme WmbuUZr4LTEXEfrh0qAdYMZpHU5/qW4rJ6UoLUZ/PGY9H6VutAupbrIg1D3wcghB9u56T1 I2vKTqa4rK2+JE8xsyeKBk0dZmOqrEXDBjaIrHaYOJ9lxSUpGFMK4sjF+DYOyrunXXDi3B RZNazF+N2xPC3ScZDvScHFRpuIzPmNh6n8JEoWBC5dy+YVaIi2XhaBYWjYzKtWsoRI80an Snk/EHsvVVF0xhnZ8Qg0h7Niccd76bjxWkKFOKztqKDNmLEn4l/R9FgHK6n/Cw== 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 4byrPZ13pPz5N6; Fri, 08 Aug 2025 04:18:42 +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 5784Iftq086542; Fri, 8 Aug 2025 04:18:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5784IfcK086539; Fri, 8 Aug 2025 04:18:41 GMT (envelope-from git) Date: Fri, 8 Aug 2025 04:18:41 GMT Message-Id: <202508080418.5784IfcK086539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 592f2e599f24 - stable/14 - devfs readdir: handle short buffer same as UFS 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 592f2e599f242826a68a08186f2e65e29c2eb887 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=592f2e599f242826a68a08186f2e65e29c2eb887 commit 592f2e599f242826a68a08186f2e65e29c2eb887 Author: Konstantin Belousov AuthorDate: 2025-08-01 08:22:14 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-08 04:16:47 +0000 devfs readdir: handle short buffer same as UFS (cherry picked from commit 011efaa5cd246a67bbe6e37364baa18178a9f7bd) --- sys/fs/devfs/devfs_vnops.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 4b6845602218..2a4576320286 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -1452,6 +1452,7 @@ devfs_readdir(struct vop_readdir_args *ap) struct devfs_mount *dmp; off_t off; int *tmp_ncookies = NULL; + ssize_t startresid; if (ap->a_vp->v_type != VDIR) return (ENOTDIR); @@ -1484,6 +1485,7 @@ devfs_readdir(struct vop_readdir_args *ap) error = 0; de = ap->a_vp->v_data; off = 0; + startresid = uio->uio_resid; TAILQ_FOREACH(dd, &de->de_dlist, de_list) { KASSERT(dd->de_cdp != (void *)0xdeadc0de, ("%s %d\n", __func__, __LINE__)); if (dd->de_flags & (DE_COVERED | DE_WHITEOUT)) @@ -1496,8 +1498,13 @@ devfs_readdir(struct vop_readdir_args *ap) de = dd; dp = dd->de_dirent; MPASS(dp->d_reclen == GENERIC_DIRSIZ(dp)); - if (dp->d_reclen > uio->uio_resid) + if (dp->d_reclen > uio->uio_resid) { + /* Nothing was copied out, return EINVAL. */ + if (uio->uio_resid == startresid) + error = EINVAL; + /* Otherwise stop. */ break; + } dp->d_fileno = de->de_inode; /* NOTE: d_off is the offset for the *next* entry. */ dp->d_off = off + dp->d_reclen;