From nobody Wed Jul 23 17:34:31 2025 X-Original-To: dev-commits-src-main@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 4bnLqD17Vxz62pxv; Wed, 23 Jul 2025 17:34: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnLqC6Yz1z3Hcf; Wed, 23 Jul 2025 17:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753292071; 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=z+hRwLKmdatfNta+VABkp1v1RDZi3389qO2XgnOMaOo=; b=e46RO/G1QdJN2jd9xmQ4izU+FpoUH8aqZ93G3s705DN9ERlZjMFSsSSUfCTJn28rjSnuYy Bo/sM+NyQZjRTv4W/DKRr3R1HZCjhn0BCCDVwrh0YEP/0RvqBHzkCXLLmLrY/VZ3ZoeU8G wVIMfVcIGUNXng6PurDfA3bHaTUH1yIqWglmAyoI92atmh/7Bf3N6R08Wa5IjIW5c/ymfC 55MDj2ray5cr+W3x94pBRgy5wEiIklPFXSpe2ydoE6G16R9Z0N8b8AYC+4OADdIKIhVcfJ Bqm2AmWDRU7ZXC84qHvHfsGvG7uBNPVay3neZ7W82CM2RAKOrPbsoZCQWTAnVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753292071; 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=z+hRwLKmdatfNta+VABkp1v1RDZi3389qO2XgnOMaOo=; b=TtydOAJI2VcKC5owzU38r3LHKl5IxYvB3UF99qTX7UMfP16wT5osTG8WWtmhUQDRX/7/sd H1b3f+9lw2BOETLWXIb3L6PZ9JthNceOgu1wUuFtx4KogoF06S0PddH8GrZDZeJy/HiYAU JF6aI3CZrKu/hF7fki8aGT56+l/61crow1E0Hzwaeve1CoQPgOJom3peYo7qN6oERVJnY8 a3It+Pl7xLC9g2GaWd+OHu0yTcZM5IU3RSNLxuSdoRQ22nJ+6w83jvCV8Et/IrhSr/TW/y yNtZqUYRuv6xU7jQWmzrmd7ACvPhGrnxtBebzgrXneQofnwz1Q7mzYWC7i3qbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753292071; a=rsa-sha256; cv=none; b=C2nvgGdJQyQ6C+Bg16zyEon0MSHUmGNI5tSYSyckeYX6+GQipj7WdDc5SQQaW02g4eH0o5 ifsr0gA028wmmB4WqbcTu/kM7w0gRKT85pxtlEDII2ax1nURUlCBYJmgFOQ6CdOAOYD1EC qY4/yX8EEk/lxnqkGhpDRZHpyrhM9/eqftL21J05tNFdSEbmpTBt58PF8zzACy178jUMaS 50h/Hz6+jyHkOlpdK0xjZP1cuMS+BJ5esUZ92tej76b8jLoxmhq+FfjQXBU2kYNsZuZbnf jyqSyHKardnFZDWZRcf/GgR/1JvuJ0R0ewjh5oyQW1dVGfW6rfaFK1uRZVEaYw== 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 4bnLqC5klZz6cY; Wed, 23 Jul 2025 17:34:31 +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 56NHYVkY090497; Wed, 23 Jul 2025 17:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NHYVMi090494; Wed, 23 Jul 2025 17:34:31 GMT (envelope-from git) Date: Wed, 23 Jul 2025 17:34:31 GMT Message-Id: <202507231734.56NHYVMi090494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b4f610a6851d - main - vfs: Handle zero-length directory reads List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b4f610a6851d9dcb54ada397c5dc93ab2e8559e1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b4f610a6851d9dcb54ada397c5dc93ab2e8559e1 commit b4f610a6851d9dcb54ada397c5dc93ab2e8559e1 Author: Mark Johnston AuthorDate: 2025-07-23 17:33:11 +0000 Commit: Mark Johnston CommitDate: 2025-07-23 17:34:13 +0000 vfs: Handle zero-length directory reads Avoid a false-positive assertion in VOP_READDIR in that case. Reported by: syzbot+4689a0b0d5918a8e3bc4@syzkaller.appspotmail.com Fixes: 77b273d8f5f4 ("vfs: Assert that VOP_READDIR sets *eofflag properly") --- sys/sys/vnode.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index c4944965a484..a416fddcddc3 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1023,7 +1023,8 @@ void vop_rename_fail(struct vop_rename_args *ap); #define vop_readdir_post_assert(ap, ret) \ nresid = (ap)->a_uio->uio_resid; \ if ((ret) == 0 && (ap)->a_eofflag != NULL) { \ - VNASSERT(nresid != oresid || *(ap)->a_eofflag == 1, \ + VNASSERT(oresid == 0 || nresid != oresid || \ + *(ap)->a_eofflag == 1, \ (ap)->a_vp, ("VOP_READDIR: eofflag not set")); \ } #else