From nobody Thu May 29 18:28:13 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 4b7ZcY6dVmz5xKJg; Thu, 29 May 2025 18:28:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7ZcY4GXmz46yF; Thu, 29 May 2025 18:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748543293; 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=rFZrBf9fTkuzjcqxN/gFE2C3xvPAOP5tR3RfPeaC8vE=; b=N3MNt1jlIiPsT0+/7u1jgdLmmMckQPflvLjSIUSKadtBVHMkreqeXg0Hdj/gJjyViErhmA NgfT7+2W4yDW2iob7LiOPlQ+SthjUW+udJl6HglXbu4aRwHtKOf5OAWEdAxjl4y6v9b7sb 9sxMCzmPAovx4JezI5XS7//AF4kxMf2cYnNdG/uANd8esIFqJolcUCnXOTtTr2Nl6wYGxp KDgdGuczmUMBbonyaP0eWgYPaSWhZaDtD3ZRIy2QV7nMvouBHiHf3bZ3QJUO3blbIsSgyZ TFSmHuvTNeL4sW09da1o6xGO7uQp9bDH1TLmVpzOlYE8KRC2FlCgxtSUC5Wpkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748543293; a=rsa-sha256; cv=none; b=EAr53dGPqtnm8eOg2Yq/qGYpdZlRfIwKY71RB1YgxwqdDR4A2N1Ar8ALSCTOOxEl/srYfW Y4RfrFOHU8WvJT1D9kUjYSlawCD4MqyzlNRb7fWH1XPOE8CnQ8xuhpT6jaO1BeDQl9ZI0Y dTLUXhyAFfD1ryZ40cAVV7L3p9NNMfBt9hU7YWpqwteJkWzFsxW4xCcV2oEatCpqgvdHfy tTBgBJYMopFYkAuDz18CdVnH8H7RqwuekRcrKVRhBhORQiFN204PGp0EG5BheDbamhKD4i GZRD5+z5UGF5YTdF0KqVn/k+sdt8mCUEJs1jyvyeVSoTJ54atKasarshMGYbpQ== 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=1748543293; 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=rFZrBf9fTkuzjcqxN/gFE2C3xvPAOP5tR3RfPeaC8vE=; b=qXwqbLiBgFWTey0jvDSQG+8Gdm/YWYRCxk9m6P8uVGWHx9Oc2rnNdKSZjDWJJcrFl8+glt X7khN9KBYMeGihoxTpYNVZjgsFAeF3qle74tCHFIRPb52GXQQ8urkmOLBGgZDGh58Pl48V LWXP0qLR7BTHFse9r+rIGz2FWyFPIffv2MCTibocUIOMM1Et4lNFKggx1k3yXkx8Sm07J4 cKpONAsf6BAVtyBVUquU3nM/jZb2f3iRp386bIVLxSRbtaLWKe9/x/SrT13gFr7VjYxhfO oy0G/bdEs5rhI3Qvq9qW3jMPK5Da1t3WyZf88UwgS26nMlnWufa4kRvzY+aGHg== 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 4b7ZcY3kHwz3T3; Thu, 29 May 2025 18:28:13 +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 54TISDOE062512; Thu, 29 May 2025 18:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TISDGY062509; Thu, 29 May 2025 18:28:13 GMT (envelope-from git) Date: Thu, 29 May 2025 18:28:13 GMT Message-Id: <202505291828.54TISDGY062509@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: 198d2ed2d4c6 - main - devfs: Set eofflag in devfs_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/main X-Git-Reftype: branch X-Git-Commit: 198d2ed2d4c6c921928a9175f825d0d8345e5a46 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=198d2ed2d4c6c921928a9175f825d0d8345e5a46 commit 198d2ed2d4c6c921928a9175f825d0d8345e5a46 Author: Mark Johnston AuthorDate: 2025-05-29 18:25:56 +0000 Commit: Mark Johnston CommitDate: 2025-05-29 18:25:56 +0000 devfs: Set eofflag in devfs_readdir() At least vn_dir_next_dirent() checks that eofflag is set appropriately when INVARIANTS is enabled, so the omission here could cause an assertion failure. Reviewed by: kib MFC after: 2 weeks Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50598 --- sys/fs/devfs/devfs_vnops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index e55082b49d97..1d744e6593c0 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -1515,6 +1515,8 @@ devfs_readdir(struct vop_readdir_args *ap) */ if (tmp_ncookies != NULL) ap->a_ncookies = tmp_ncookies; + if (dd == NULL && error == 0 && ap->a_eofflag != NULL) + *ap->a_eofflag = 1; return (error); }