From nobody Sun Feb 15 08:58:49 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 4fDKZf3MHGz6SGkt for ; Sun, 15 Feb 2026 08:58:50 +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 4fDKZf1YmSz46y8 for ; Sun, 15 Feb 2026 08:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771145930; 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=pAAX3m07tTWpMU/Q8p/ZBdVzvNTQq2Lo9CuQDskrwUs=; b=FefDFO/Sfxbe83CQrNb8/Y8m3SVHGoiLRgzAv+dA2HWC8Adqf6dyta61nvTAjJ7Vf2lk/5 zQ8Vl1Guw0tPpdWui8VPLIv0DZR4sUwPJhS7Ccgvj6zyoToQHSxbWt4xIfTksU1SXEg0IJ F3OdBB0OJlxXMaTHnbXkWdT8QA7125ejSTJpjIVPTdfpg26OiYTmOJ8T8EjCe6j2xLN3Vo f2qvT8k0ktpA1PvkA43Q4GZWhiDIW9KDP9LDe56thtsf0eFcetc57X0Ywxb0L4Z0LDnSSo vUsaPvnhiYI8UIf6AM3bksWxJrUsNfvVgtjZqHlAGRaFeHYI5J76sdINvLSFeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771145930; a=rsa-sha256; cv=none; b=CQpjuokI5LjcsnAD0oRdl7XrT8CpyYxEBRGi5cnVhuyLad171bhoMzy91VABSbxKMj6xm8 N4H3C2O4C6npYN1XCS62ZqzZ5yr2AHcE98X1yV6F8V/JZ2k9UihJkMX1ChG6qdpMVzQcEn LGWuC8hK3g/NWJfSZrTxnpoSggFo5jVCmRK5LhM3npoN3jdLpkFToMMB+NYzNX8r1bDGsB +P6Ppl6G2pwYmn6HGMRSYOmCv+XDPtZdewvVTGYD+ZTIpB1UGrFHFbIZ6c6DEfxjt0nQwc QfnHE4YOt4l0BG8QKIKFiAV1yovDbXMkLbsOLgXoad1cjLiBoatrMxbB7jrLew== 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=1771145930; 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=pAAX3m07tTWpMU/Q8p/ZBdVzvNTQq2Lo9CuQDskrwUs=; b=nfiJz4/JXL76Jz1moDxU8gPR4eq4vLN6rpaqaQjUZucG79aPCsuTwpwxmcTfC+acMaaH79 Y6oFmuhKZHVyaW1NFFmDweMx2j4893kgnBY3+aRzbqyhLthG73NCHheLBoXd2rrWZ5Euh5 8Urt197Le1dMOEKwiPQnd4JbL2yzrAZSBvvQPHchUuZwU7sLpHD8HOiqGMfbmlcB6tK+lM f62weLw42XCxrsd2v1ugaiVC3S0JZ7zNfO3x8CQbpcj+z1V3yM4lx9UK5BA0Rguaj7W6PE j02VOJELw5VFcppslhURNjEHQ570GEczGcsV6jV7dy2rYPLETitUBENJ0cgE0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDKZf0QYKzmrS for ; Sun, 15 Feb 2026 08:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18ffc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 08:58:49 +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: 0c5c50353026 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 0c5c50353026bd9d7dca862b6033bcc9cbd8cea1 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 08:58:49 +0000 Message-Id: <69918ac9.18ffc.26bb4a4b@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0c5c50353026bd9d7dca862b6033bcc9cbd8cea1 commit 0c5c50353026bd9d7dca862b6033bcc9cbd8cea1 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-15 08:58:35 +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 7ea07645d751..d943e3bfaaf7 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -61,7 +61,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 **)) { @@ -86,6 +87,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; @@ -97,6 +99,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. */ @@ -105,6 +114,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; @@ -132,7 +142,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; @@ -144,7 +154,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; @@ -218,11 +228,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 fb6080ee6916..61fa618b8d2c 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -378,6 +378,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()