From nobody Sun Feb 15 08:58:56 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 4fDKZp2XQQz6SGl0 for ; Sun, 15 Feb 2026 08:58:58 +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 4fDKZn59L3z47JL for ; Sun, 15 Feb 2026 08:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771145937; 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=5eRivy/OkdonPrDeQNgO6jrDmrZ/cSmIY/OJ3dfWQEk=; b=cN9pQ714AWJoVjDMvieM5yY4DVGaJwUh1sm/QRVmzUcOnFkWyvq6jlzLxxdObPVPeRonTt xGlVNJZVe1pGycZ4GrkYGWDb9MAqRCccF/El9hJJCI9zkf7IxN+X6JPyckQSzNlOtL1Wbt LFtytha1U6ZoL0S512S7RHkp3c4UEV633JDlb3BsbnCU4afMBast+CnAsWb9Kjdqaw8v5L CY6BXPy3+VahoSmG9MCLDovzHrU7yfFVBAiCqwV21PNlvS0h/c3CpqzNSOv6fglicpiXlB OYZOQn/nxax03AnH8Yp0vEAP602GenJihSyDzHvudXZRRyHAQ5mIAlP1g0wVfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771145937; a=rsa-sha256; cv=none; b=bkMkVnJuvK3BZiQzE1grbuAqQR4uglpcymRNb3XMqlELxpjl1w+3VKwXoB1ARkDm2xaPP2 slg/RHLYTE1VJGy5kEgsLL/YXWVJIfG71s6FrXS+c6pwgr7YMYHGvZKo/zHfPuKJQrymIR ej7KyTUSyQZxy0juhvx2cxz2bHvSV2P6J6QV1Ba9YWvzkwS7gQ7Q4XFNbcz86DwOawQKuD H/dRD4Pq5c/kfxxq9FtufRD/tUNYpSEvFad2nKK9lU/MrPeZ25r6FPIl7Icpel27iaok7p 8I0OgjYhVyZZYZ2Kir2iWtmiphr+EcXHn3Tx756dZt99wxgfITjX14OWMVB2Aw== 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=1771145937; 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=5eRivy/OkdonPrDeQNgO6jrDmrZ/cSmIY/OJ3dfWQEk=; b=lvhk7SxsTQCTQj1QuShBCz4Uo9ha1qZ2G8nGMLJ9GDvhAZIIMu/9tlMJp0X7gLg9AjJVn7 uT4Hh/f3UmQ9PZ8dcmnenRPzjFAHoHSFd1C5tj+o8OtTecMlfZyU/ehA0EdEh9BwbqSaxx q/h9MRADKxtmEjbcVuI4N+c8KDr9knuHIrycRL/OOiqhpcYcDgY3NNdmTPZh7SvsdFHkIz oKTtHJXkDYo6qs7OIbP/TvtGpXOOz5AABhar+k/9NERaCd2iwPsp0mo3Fkh1ByedBsYh9a KYqIueYl6B+MxK4x3TkhX0pJiWhP2agotv5rRDkRtLqI8R35EeZZR1PH2T3J3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDKZm662wzn9h for ; Sun, 15 Feb 2026 08:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c8c9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 08:58:56 +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: 74e3453b9051 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 74e3453b90512fb0777dfcd4f0150ff41ba28ad1 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 08:58:56 +0000 Message-Id: <69918ad0.1c8c9.42a43461@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=74e3453b90512fb0777dfcd4f0150ff41ba28ad1 commit 74e3453b90512fb0777dfcd4f0150ff41ba28ad1 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-15 08:58:47 +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 200613927715..6d71d0eeada5 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -59,7 +59,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 (*select)(const struct dirent *), int (*compar)(const struct dirent **, const struct dirent **)) { @@ -84,6 +85,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; @@ -95,6 +97,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. */ @@ -103,6 +112,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; @@ -130,7 +140,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; @@ -142,7 +152,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; @@ -216,11 +226,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 4d9233da1b1e..df98540083f9 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -302,6 +302,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()