From nobody Wed Feb 11 19:56:48 2026 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 4fB8Mh3TBnz6S6W7 for ; Wed, 11 Feb 2026 19:56:48 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB8Mh2mn6z3C70 for ; Wed, 11 Feb 2026 19:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770839808; 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=CVSZAvztIJrFiLlfzL3LxG7DDk8JzJUWh5U/8U95Xww=; b=mXQgDg2a93K7h6ZKzd6NG9Kg8SsetrbcPLhwWQ1l+65QlzxKgH6OjD6R5lCa0z8UjZ5HIU L10dcoVqw1ruTyHZXv9Bv0IlBTJ7IQX+Ugw2GU/gl6NoZFHWoCDOxBacLtXSOmE84eC33K ymY4WWg0MilUUSxamm56NhAQJsj+0366fVQNamC7NSUU2Yx6LXhRwy3gpdtrX6Udo5TRCB ZK6dogaqs7fKEfs0N5NI1K5yVji4zteFb9wMnDk2DPeuu4Xho8Ytnk3iQgoZ0k1S2ZzZe0 DMExgsZVR3DyUFYwi7jLoa3Gs/EMEu3OWreYJvJCyhAwACCFodSu8vKMDSEQFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770839808; a=rsa-sha256; cv=none; b=lADvxfVvorzgYelQbp+ewOmVNwLtJJc3J6Itw/o5e4B+FI88wvpF+NXl6ny16r47Qoc8sz H4elF96FCDmVIoKOYlLwAflqIxynCT2pOeY+kZ0FYzVpTvrx8x+OGsmuN6VbNExWtIH5pE zeSZWL+Qzcdtb1mjEXdQkdjkY1XDSvMcwVz7R+kiI/inaHbLgyataAq09FaTRNRAg02h5o eFymFovam2ptyw4pKnsYbze8TvhCjyEmbgMJMhWfOvn7nvhkCJqWWI23wt94/08lpOCA47 HkbFXmuIbx6aydgfukjy31kGsmScKcs1F4oh3XmmZjuzLSI9rpELZ4NHMG4Leg== 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=1770839808; 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=CVSZAvztIJrFiLlfzL3LxG7DDk8JzJUWh5U/8U95Xww=; b=U7bt0xRjdpuIfxK0cjYPB+n84NFhv6q3O6erbcQgQvJMDhn3aQYz9ngmjbH4ydacKGDFQJ HEsPxLxrj1IYKpbMabUISuDNrdzJI5kkwBPy2M39yaOjVg0MDGMZusknKDx7gtD8CMuZJD LdbVUSSDah54PyEwWb+XNqkZayPq8TenfvBW5CYzvAt9ditDqmJwJf9tBTqem7HMW3YTBA qFD4GWCgDdVQIwfFCLrcFzSOlQRatzdVToh3LEWNm+Vn54ryfqqXkRFWciFuKl8SPQG1gY tiJ8ZQwO4NMZbR9q4xtii179gpP5ma69lzJCy7yDfNrVHNoZnid/hhRJgurWPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB8Mh21Mzz13VX for ; Wed, 11 Feb 2026 19:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 438f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 19:56:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 7bf81e39d830 - main - ls: check fts_children() for errors that may not surface otherwise 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bf81e39d83087dc7f984077b5eed5a48df794d4 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 19:56:48 +0000 Message-Id: <698cdf00.438f0.1764e898@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7bf81e39d83087dc7f984077b5eed5a48df794d4 commit 7bf81e39d83087dc7f984077b5eed5a48df794d4 Author: Kyle Evans AuthorDate: 2026-02-11 19:55:55 +0000 Commit: Kyle Evans CommitDate: 2026-02-11 19:56:37 +0000 ls: check fts_children() for errors that may not surface otherwise In particular, if one simply does a non-recursive `ls` on a directory that is not accessible, there are some classes of errors that may cause it to fail that wouldn't be surfaced unless we do an fts_read() that will recurse into the inaccessible directory. Catch those kinds of errors here since we cannot expect to an FTS_ERR/FTS_DNR entry to follow up on them. PR: 287451 Reviewed by: kib Discusssed with: des Differential Revision: https://reviews.freebsd.org/D51056 --- bin/ls/ls.c | 17 +++++++++++++++++ bin/ls/tests/ls_tests.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index b3d0a508d714..c33d4d38c359 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -707,6 +707,23 @@ traverse(int argc, char *argv[], int options) output = 1; } chp = fts_children(ftsp, ch_options); + if (chp == NULL && errno != 0) { + warn("%s", p->fts_path); + rval = 1; + + /* + * Avoid further errors on this entry. We won't + * always get an FTS_ERR/FTS_DNR for errors + * in fts_children(), because opendir could + * have failed early on and that only flags an + * error for fts_read() when we try to recurse + * into it. We catch both the non-recursive and + * the recursive case here. + */ + (void)fts_set(ftsp, p, FTS_SKIP); + break; + } + display(p, chp, options); if (!f_recursive && chp != NULL) diff --git a/bin/ls/tests/ls_tests.sh b/bin/ls/tests/ls_tests.sh index c732b60b21a4..be662b75695d 100755 --- a/bin/ls/tests/ls_tests.sh +++ b/bin/ls/tests/ls_tests.sh @@ -476,6 +476,35 @@ b_flag_body() atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b } +atf_test_case childerr +childerr_head() +{ + atf_set "descr" "Verify that fts_children() in pre-order errors are checked" + atf_set "require.user" "unprivileged" +} + +childerr_body() +{ + atf_check mkdir -p root/dir root/edir + atf_check touch root/c + + # Check that listing an empty directory hasn't regressed into being + # called an error. + atf_check -o match:"total 0" -e empty ls -l root/dir + + atf_check chmod 0 root/dir + + # If we did not abort after fts_children() properly, then stdout would + # have an output of the total files enumerated (0). Thus, assert that + # it's empty and that we see the correct error on stderr. + atf_check -s not-exit:0 -e match:"Permission denied" ls -l root/dir + + # Now ensure that we didn't just stop there, we printed out a directory + # that would've been enumerated later. + atf_check -s not-exit:0 -o match:"^root/edir" \ + -e match:"Permission denied" ls -lR root +} + atf_test_case d_flag d_flag_head() { @@ -971,6 +1000,7 @@ atf_init_test_cases() #atf_add_test_case Z_flag atf_add_test_case a_flag atf_add_test_case b_flag + atf_add_test_case childerr #atf_add_test_case c_flag atf_add_test_case d_flag atf_add_test_case f_flag