From nobody Sun Feb 15 08:58:07 2026 X-Original-To: dev-commits-src-branches@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 4fDKYr0vGZz6SH11 for ; Sun, 15 Feb 2026 08:58:08 +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 4fDKYq2jmnz46R7 for ; Sun, 15 Feb 2026 08:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771145887; 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=hs3amUC/gSYPoWn5VZu2a/4rdXAvAtObFiInXNar+Tk=; b=a6t4KgaZI+5Gx/EwAqxgsBAsH3gpoN5UhlbD7u63XGo/X1ia9YptKZypXtS5XeNP6nnI1H HHfPhr97PS/kHlFuSA5fXPGe4kEEUjYuOOftaKkp2PXo9X0ewm8bGcQfmgVsnEPB7z1Cuc 5f4qhAcsSmRAwF+EUGqIn0naoT6adsjb/q2RDVNQjGQzKRmmuQjyrqFPUJT51naPZQI7pa RsGMdFbm8965T8f/KY26m0e4MecThtXQ1MAMw3rSzRarmI8BwPcBlU+zX6joRlytX0pTT5 Ja3SCSRBofyTTHpUpiFuBEBR58ADoUs0BS8lpKa5QPZwszO2TP+dxczncxJXSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771145887; a=rsa-sha256; cv=none; b=AbzeuDHZb+pYjxD3CnWdJ/LNkROSKrC7obgtycY+Q5JFZT2/n7Qnwqg+ahZjTHQnQ78gI3 c3dPdVEYyFn5Xg292dHuK3RxIJiNisAkO1eg33PV1Ed7emKQM3lSCikqKD3xceGhBHB02r DE5w+ArCxqh/xlkRxDFm/uPGzCfQmwB+r9E5W0Cqq5iX6bGYFRDuf1HaH0PtTdcZu5BqeR v4cNesdRVAFQiGg9L7Dorvry769/zpWSCjKW31YGODB04+yf4toG1ALJveHp/2WcSGrquC mBbjnnYnJdTfCUiHPjueEWVgRrAQiaxKkRouyeFE7VK6nAK5BDvIinSkvZ/PlA== 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=1771145887; 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=hs3amUC/gSYPoWn5VZu2a/4rdXAvAtObFiInXNar+Tk=; b=xkZ3xq3coyBAZHXdlTX2r0Zg7jjVYxdfA8S1q+5a1EatBcK2CjC0ShQDGu+rUJ8cHQV+6N 9Zfq5cOfyZelfFQ24e+AdqgGqXuZousYLZovybHsbiBc50WXgUckveFacHvB+ZIPGDvSQl A0kTjgOELIBUWvfOUZl7gNlM1aY8ua3hkMgVS2goJRT9CyC/mjpo5qv88XUAipESB+saSl 0x8lvvJNu8frDjfdJnKNhyunNVw1Mm5Yb2fHmYi+s4RSi2eQkk7np+3x9y/GztzMXJbB71 VjbxbUUdWqNJBk1AVfaMuOEvLve9EWbpliAG1hJdPWJtuznkYWlvpdmlgtQusw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDKYq1q7Dzn55 for ; Sun, 15 Feb 2026 08:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d023 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 08:58:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f201382a551d - stable/15 - diff: Improve directory loop detection List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f201382a551dfde1aa759e4c17eac29e24da802f Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 08:58:07 +0000 Message-Id: <69918a9f.1d023.8b2747d@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f201382a551dfde1aa759e4c17eac29e24da802f commit f201382a551dfde1aa759e4c17eac29e24da802f Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-15 08:57:46 +0000 diff: Improve directory loop detection When we're done processing a directory, remove its entry from the tree of visited inodes, ensuring that we only report a loop when we encounter a descendant-to-ancestor link, not when we encounter a cousin-to-cousin or sibling-to-sibling link. MFC after: 1 week Reported by: Bakul Shah Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55248 (cherry picked from commit 71569594d860a59d8362770a56d806e1d31fb946) --- usr.bin/diff/diffdir.c | 20 +++++++++++++++++--- usr.bin/diff/tests/diff_test.sh | 5 +++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 0e9beb80e6a1..489b873e2fcf 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -60,7 +60,8 @@ static struct inodetree v2 = RB_INITIALIZER(&v2); RB_GENERATE_STATIC(inodetree, inode, entry, inodecmp); static int -vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, +vscandir(struct inodetree *tree, struct inode **inop, + const char *path, struct dirent ***dirp, int (*selectf)(const struct dirent *), int (*comparf)(const struct dirent **, const struct dirent **)) { @@ -85,6 +86,7 @@ vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, goto fail; RB_INSERT(inodetree, tree, ino); close(fd); + *inop = ino; return (ret); fail: serrno = errno; @@ -96,6 +98,13 @@ fail: return (-1); } +static void +leavedir(struct inodetree *tree, struct inode *ino) +{ + RB_REMOVE(inodetree, tree, ino); + free(ino); +} + /* * Diff directory traversal. Will be called recursively if -r was specified. */ @@ -104,6 +113,7 @@ diffdir(char *p1, char *p2, int flags) { struct dirent *dent1, **dp1, **edp1, **dirp1 = NULL; struct dirent *dent2, **dp2, **edp2, **dirp2 = NULL; + struct inode *ino1 = NULL, *ino2 = NULL; size_t dirlen1, dirlen2; char path1[PATH_MAX], path2[PATH_MAX]; int pos; @@ -131,7 +141,7 @@ diffdir(char *p1, char *p2, int flags) * Get a list of entries in each directory, skipping "excluded" files * and sorting alphabetically. */ - pos = vscandir(&v1, path1, &dirp1, selectfile, alphasort); + pos = vscandir(&v1, &ino1, path1, &dirp1, selectfile, alphasort); if (pos == -1) { if (errno == ENOENT && (Nflag || Pflag)) { pos = 0; @@ -143,7 +153,7 @@ diffdir(char *p1, char *p2, int flags) dp1 = dirp1; edp1 = dirp1 + pos; - pos = vscandir(&v2, path2, &dirp2, selectfile, alphasort); + pos = vscandir(&v2, &ino2, path2, &dirp2, selectfile, alphasort); if (pos == -1) { if (errno == ENOENT && Nflag) { pos = 0; @@ -217,11 +227,15 @@ diffdir(char *p1, char *p2, int flags) closem: if (dirp1 != NULL) { + if (ino1 != NULL) + leavedir(&v1, ino1); for (dp1 = dirp1; dp1 < edp1; dp1++) free(*dp1); free(dirp1); } if (dirp2 != NULL) { + if (ino2 != NULL) + leavedir(&v2, ino2); for (dp2 = dirp2; dp2 < edp2; dp2++) free(*dp2); free(dirp2); diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 6ca19a8f20cb..0d3acf50edf9 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -382,6 +382,11 @@ dirloop_body() -e match:"a/foo/bar/up: Directory loop detected" \ -e match:"b/foo/bar/up: Directory loop detected" \ diff -r a b + atf_check rm [ab]/foo/bar/up + atf_check mkdir -p b/foo/bar + atf_check ln -s foo a/baz + atf_check ln -s foo b/baz + atf_check diff -r a b } bigc_head()