From nobody Thu Feb 5 15:27:23 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 4f6Lgc20jbz6Qky4 for ; Thu, 05 Feb 2026 15:27:24 +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 4f6Lgc0Qpxz3Xd0 for ; Thu, 05 Feb 2026 15:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305244; 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=CUD3buur6hmF3dsaAHLXNIfr0Pyrmm1i+QbmyUOFtgk=; b=NMbswe1TqbHc7RrUQqKW8rBoiifC2PZxfkQGFZ84X5wEpOdE0mVfwh18Z9ElwBGZs+yDPM 6U2CFLTqBRJDEIqyfHn0pIqb8drKNrkhVFxN6RfuTxDrRezfeu3AIx90ls7sr5TGXKtvTq ZGjdC68BezhzfpHpSrQ+H7238AhQe3y8JziJHcdr3I7G3C2yq+DZ1jH3hyw4X+uFTESWDH KiwkoYY+AnxjQajzgyBoCR0TUyD4/o05RlLF4d5BBITdwEM+PRJ2iDBVtawRZbhLm5lTfi t62q1W/WrsBf/t4jB9z7ps0QSdn5kqKNbO4u6e+V9jPVrJ4yRtT8pY791a8SLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305244; a=rsa-sha256; cv=none; b=Id+VNjJWGsH8u7YH5xhAQQPKW0I7US4VFwJk8MmPNnD/CeGS4+QOl7ArC6MiNqG33ZlNmg yooFEkQtxrRoypwV6WN7H79u7OWIVrVs5cPumrVHMkrx/aNhjZ62YSW/mGiPrqDs+TG3d5 r1iduPjM288YIeyxpqjEfxCNOvYoZ/Efv6zghnDyuz/pXG5dx/QR1v+PFXY4e113sczg+u 4JAftBKtDUnfG5VGD8h6GPX/H4ZFdlY6wqOdMh4slc9WP/T3IbdjAwmIk4lPEPcKkMNlSn r0DBE7do+UToJZBj/s6jwU7fS6KZ0l8fEnTvaEwpeXEyRu7jLcV4ynnUzEmWvg== 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=1770305244; 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=CUD3buur6hmF3dsaAHLXNIfr0Pyrmm1i+QbmyUOFtgk=; b=tdw6U3QrkdO3hRLZ9HwuX5GlUH03VaWCGPnyKR7iTjwEqwcBuOkybR0CNLFkRk76HKvHeU 9szV1A89rT5woGBli392le9J3C5IgC+1GeJvoX+YIrySzdWxPBLoNHu50KHshNNejjt/b+ eBDWyO0NQlxLu97plykF2SR/5txQm+iDi/06AzzmHYPBNbw1oB1GDXAL5ODlxrabgoowPw SfnMJybQXAgrmq17zpAysQExc2ZjpZNUlpaDtK7CerHd3oJ37QwkNo2o9mwGOAAryPk3w0 Npx1gkHXdqVg2EIfjN5uDF2eW3jjQ+CRmSx+xqvJqgFjsWOBV6UCOyvO69J7UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lgb74wDzc2Q for ; Thu, 05 Feb 2026 15:27:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc7b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:27:23 +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: e8009e02e967 - stable/14 - diff: Detect loops when diffing directories. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e8009e02e967618c58a033ace838561ba3400d38 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:27:23 +0000 Message-Id: <6984b6db.3fc7b.6a40e336@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e8009e02e967618c58a033ace838561ba3400d38 commit e8009e02e967618c58a033ace838561ba3400d38 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 11:10:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:47:46 +0000 diff: Detect loops when diffing directories. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50936 (cherry picked from commit 42092e1b6625b8226de5f34d22b9a96c713626cb) --- usr.bin/diff/diffdir.c | 85 ++++++++++++++++++++++++++++++++++++----- usr.bin/diff/tests/diff_test.sh | 17 +++++++++ 2 files changed, 92 insertions(+), 10 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 798229e990df..08c2efd119ca 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -22,10 +22,12 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -42,6 +44,61 @@ static void print_only(const char *, size_t, const char *); #define d_status d_type /* we need to store status for -l */ +struct inode { + dev_t dev; + ino_t ino; + RB_ENTRY(inode) entry; +}; + +static int +inodecmp(struct inode *a, struct inode *b) +{ + return (a->dev < b->dev ? -1 : a->dev > b->dev ? 1 : + a->ino < b->ino ? -1 : a->ino > b->ino ? 1 : 0); +} + +RB_HEAD(inodetree, inode); +static struct inodetree v1 = RB_INITIALIZER(&v1); +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, + int (*select)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)) +{ + struct stat sb; + struct inode *ino = NULL; + int fd = -1, ret, serrno; + + if ((fd = open(path, O_DIRECTORY | O_RDONLY)) < 0 || + (ino = calloc(1, sizeof(*ino))) == NULL || + fstat(fd, &sb) != 0) + goto fail; + ino->dev = sb.st_dev; + ino->ino = sb.st_ino; + if (RB_FIND(inodetree, tree, ino)) { + free(ino); + close(fd); + warnx("%s: Directory loop detected", path); + *dirp = NULL; + return (0); + } + if ((ret = fscandir(fd, dirp, select, compar)) < 0) + goto fail; + RB_INSERT(inodetree, tree, ino); + close(fd); + return (ret); +fail: + serrno = errno; + if (ino != NULL) + free(ino); + if (fd >= 0) + close(fd); + errno = serrno; + return (-1); +} + /* * Diff directory traversal. Will be called recursively if -r was specified. */ @@ -62,26 +119,22 @@ diffdir(char *p1, char *p2, int flags) status |= 2; return; } - if (path1[dirlen1 - 1] != '/') { - path1[dirlen1++] = '/'; - path1[dirlen1] = '\0'; - } + while (dirlen1 > 1 && path1[dirlen1 - 1] == '/') + path1[--dirlen1] = '\0'; dirlen2 = strlcpy(path2, *p2 ? p2 : ".", sizeof(path2)); if (dirlen2 >= sizeof(path2) - 1) { warnc(ENAMETOOLONG, "%s", p2); status |= 2; return; } - if (path2[dirlen2 - 1] != '/') { - path2[dirlen2++] = '/'; - path2[dirlen2] = '\0'; - } + while (dirlen2 > 1 && path2[dirlen2 - 1] == '/') + path2[--dirlen2] = '\0'; /* * Get a list of entries in each directory, skipping "excluded" files * and sorting alphabetically. */ - pos = scandir(path1, &dirp1, selectfile, alphasort); + pos = vscandir(&v1, path1, &dirp1, selectfile, alphasort); if (pos == -1) { if (errno == ENOENT && (Nflag || Pflag)) { pos = 0; @@ -93,7 +146,7 @@ diffdir(char *p1, char *p2, int flags) dp1 = dirp1; edp1 = dirp1 + pos; - pos = scandir(path2, &dirp2, selectfile, alphasort); + pos = vscandir(&v2, path2, &dirp2, selectfile, alphasort); if (pos == -1) { if (errno == ENOENT && Nflag) { pos = 0; @@ -115,6 +168,18 @@ diffdir(char *p1, char *p2, int flags) dp2++; } + /* + * Append separator so children's names can be appended directly. + */ + if (path1[dirlen1 - 1] != '/') { + path1[dirlen1++] = '/'; + path1[dirlen1] = '\0'; + } + if (path2[dirlen2 - 1] != '/') { + path2[dirlen2++] = '/'; + path2[dirlen2] = '\0'; + } + /* * Iterate through the two directory lists, diffing as we go. */ diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index c29c0a93d5d8..2efb2a844078 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -23,6 +23,7 @@ atf_test_case binary atf_test_case functionname atf_test_case noderef atf_test_case ignorecase +atf_test_case dirloop simple_body() { @@ -360,6 +361,21 @@ ignorecase_body() atf_check -o empty -s exit:0 diff -u -r --ignore-file-name-case A B } +dirloop_head() +{ + atf_set "timeout" "10" +} +dirloop_body() +{ + atf_check mkdir -p a/foo/bar + atf_check ln -s .. a/foo/bar/up + atf_check cp -a a b + atf_check \ + -e match:"a/foo/bar/up: Directory loop detected" \ + -e match:"b/foo/bar/up: Directory loop detected" \ + diff -r a b +} + atf_init_test_cases() { atf_add_test_case simple @@ -386,4 +402,5 @@ atf_init_test_cases() atf_add_test_case functionname atf_add_test_case noderef atf_add_test_case ignorecase + atf_add_test_case dirloop }