From nobody Mon Aug 17 20:12:06 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 4hP3s754Jcz6pHk0 for ; Mon, 17 Aug 2026 20:12:11 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hP3s73Lkfz3ds2 for ; Mon, 17 Aug 2026 20:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786997531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3a4OEOYMlXdvVEaH5r1E4wAgEKVYYZKwFoe5ni5/4g=; b=t2zA7YTAnWPae1N5x5vNBGMz7oV2uLir255wcDfSeuKWfGLkDtINzsF87u6BIQikwhbIhN 27+c6GTTIC46S/ugmXocF0rWwonIZbkrjXnsVhXHnnRvdR9m5T02g+Juv5xmyuytxyQo1r ox/nTaO3SjGrAohhGyTRJnJlwY18jWYKRZMLedbaHhccO2MTeQGRHDdpd0z91cCGpa7Eoc V1LY6QgjDmohsa2d7OrLuWeih2dVDlDTP0RsgV7SPCdO5lEE+2grYNGe0g1zUAng1Z+2FW wBZqeoXpd+tCPSysSAxBvy0dcrvPVt0fyU9lvmKNppCY4sUo6D44FZMHZnD3cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786997531; a=rsa-sha256; cv=none; b=onjlbItAMTa/YmRD6PjKfFnQb3YSq/6dCe4p+crInH4m/Z9L+ThhKJ8fH5LgO4VS9/k/od XPhUl0VOZPFyoMpOGIDOyKnwO7LIt1TLBSRYahrg5I+9FJIbwEVclNAfN8oUaBhKv2vHcJ Z8UxqOPo/8sJOW0+q0DQaM9wgjau0UKZQNksAnKFjOQfMy3F91ZvdxPABYDOg+CwdWhBB/ hJeUiT2WRgVst8aEIlzFUo9nLNXrAW/0OU1G3LOX/plDtAehdyDMH5Qu3dwueMNbF4MAIY 1zIElyVhKIAaSvYBaLWzMjK7yV9LqB5MFoUnuixT6Rdqxa8jjRNP/FFyIZf1/w== 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=1786997531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3a4OEOYMlXdvVEaH5r1E4wAgEKVYYZKwFoe5ni5/4g=; b=aTRZ6j93BBgy/iDrsgOZw6x9QwWKP/gipTShqR2tL4lf8gecWjBz1/mcIG9qOwNfABjgGQ xUkemyvNQMkqSRafPXOoJ+njwDNuAgzOdGAit7Ob0ZL8NTpHmvlW8wQ3GQjQ1pLyRAND+m izKAbGDe9BadKxUHRBqUP0eKpjxoweFF8z4rNCpMYYGqDWtlknf5g6oY/nOduU3quEmB2h UkIW9jaRrvlH+ekHrbOCTNx/kubOULQRMbN5DUcSF0EkueoGbyk3uQlY4t/xEr+58P2EFW Sdlny3vJ+muTObO1XXAuhwElO85p0pooZLoSKzz7zelpiyh7lAD5ThxxCeMHMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hP3s724r8z1RvQ for ; Mon, 17 Aug 2026 20:12:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e3f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 17 Aug 2026 20:12:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jitendra Bhati From: Alan Somers Subject: git: 9b8c2bffeba9 - main - fts: fix file descriptor leak in fts_close 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b8c2bffeba9861c3f5bda0e5a08943e5ed4853f Auto-Submitted: auto-generated Date: Mon, 17 Aug 2026 20:12:06 +0000 Message-Id: <6a836b16.1e3f6.6024548a@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9b8c2bffeba9861c3f5bda0e5a08943e5ed4853f commit 9b8c2bffeba9861c3f5bda0e5a08943e5ed4853f Author: Jitendra Bhati AuthorDate: 2026-08-15 16:06:39 +0000 Commit: Alan Somers CommitDate: 2026-08-17 20:06:57 +0000 fts: fix file descriptor leak in fts_close fts_build() stores a dup'd file descriptor in each directory entry's fts_dirfd. When a traversal is abandoned before completion and fts_close() is called, the cleanup loop freed each pending entry with free() without first closing its fts_dirfd, leaking one descriptor per pending directory. Close fts_dirfd before freeing each entry in the cleanup loop, matching the handling already applied to the dummy parent entry after the loop. Add a regression test that descends a couple of levels, abandons the traversal, closes, and asserts the open descriptor count is unchanged. PR: 297557 Reported by: asomers Fixes: 4bd01d6ae016 Sponsored by: Google LLC (GSoC 2026) Reviewed by: asomers Pull Request: https://github.com/freebsd/freebsd-src/pull/2373 --- lib/libc/gen/fts.c | 2 ++ lib/libc/tests/gen/fts_misc_test.c | 66 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index 96741dab8beb..66c5f62d9a8f 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -356,6 +356,8 @@ fts_close(FTS *sp) for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) { freep = p; p = p->fts_link != NULL ? p->fts_link : p->fts_parent; + if (freep->fts_dirfd >= 0) + (void)_close(freep->fts_dirfd); free(freep); } if (p->fts_dirfd >= 0) diff --git a/lib/libc/tests/gen/fts_misc_test.c b/lib/libc/tests/gen/fts_misc_test.c index 95593e26095c..6f035a21e173 100644 --- a/lib/libc/tests/gen/fts_misc_test.c +++ b/lib/libc/tests/gen/fts_misc_test.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include @@ -576,6 +577,70 @@ ATF_TC_CLEANUP(xdev, tc) (void)unmount("dir/mnt", 0); } +/* + * Return the number of open file descriptors in the current process + * via the kern.proc.nfds sysctl. + */ +static int +count_open_fds(void) +{ + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_NFDS, 0 }; + int nfds; + size_t len = sizeof(nfds); + + ATF_REQUIRE_EQ_MSG(0, + sysctl(mib, nitems(mib), &nfds, &len, NULL, 0), + "sysctl(kern.proc.nfds): %m"); + return (nfds); +} + +ATF_TC(no_fd_leak_on_early_close); +ATF_TC_HEAD(no_fd_leak_on_early_close, tc) +{ + atf_tc_set_md_var(tc, "descr", + "fts_close must not leak directory fds when the traversal " + "is abandoned before completion"); +} + +ATF_TC_BODY(no_fd_leak_on_early_close, tc) +{ + char *paths[] = { ".", NULL }; + FTS *fts; + int fds_before, fds_after; + + /* + * Regression test for a file descriptor leak (bug 297557). + * fts_build() stores a dup'd fd in each directory entry's + * fts_dirfd. If the traversal is abandoned partway through + * and fts_close() is called, the cleanup loop must close + * those fds; previously it freed the entries without closing + * fts_dirfd, leaking one fd per pending directory. + */ + ATF_REQUIRE_EQ(0, mkdir("sub1", 0755)); + ATF_REQUIRE_EQ(0, mkdir("sub1/deep", 0755)); + ATF_REQUIRE_EQ(0, close(creat("sub1/deep/file", 0644))); + + fds_before = count_open_fds(); + + /* + * Open, descend a couple of levels, then abandon the traversal + * and close. The directory entries for '.' and 'sub1' hold + * dup'd fds that must be released by fts_close(). + */ + ATF_REQUIRE((fts = fts_open(paths, FTS_PHYSICAL, NULL)) != NULL); + ATF_REQUIRE(fts_read(fts) != NULL); /* . */ + ATF_REQUIRE(fts_read(fts) != NULL); /* sub1 */ + ATF_REQUIRE(fts_read(fts) != NULL); /* deep */ + ATF_REQUIRE_EQ_MSG(0, fts_close(fts), "fts_close(): %m"); + + fds_after = count_open_fds(); + + ATF_CHECK_EQ_MSG(fds_before, fds_after, + "fts_close leaked file descriptors: %d open before, " + "%d after", fds_before, fds_after); +} + + ATF_TP_ADD_TCS(tp) { fts_check_debug(); @@ -592,6 +657,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, nochdir_empty_terminal_dir); ATF_TP_ADD_TC(tp, ns_errno_set); ATF_TP_ADD_TC(tp, xdev); + ATF_TP_ADD_TC(tp, no_fd_leak_on_early_close); return (atf_no_error()); }