From nobody Fri Jun 20 11:10:51 2025 X-Original-To: dev-commits-src-main@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 4bNvsl6fjtz5ytF4; Fri, 20 Jun 2025 11:10:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bNvsl402Zz3gXH; Fri, 20 Jun 2025 11:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750417851; 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=2MG/mj1pnqo1+UiMPi6pUk3HSPecmlqfpXt1d9axCu0=; b=smWV++RjULY9Oi+fvWwI83xaj4gLp4NyIWNyllSgpqLtj0geyzjNN80WLncSKFXD/Q8oiH 1Mo/zrik7a983NzeSrr4t9vg5Xif0NTeUwdeNUky3tDXch9aK/MmUKFe6y7rIUz7oOkxes x4STRu61bRpS+qX7wVG22rQHFjQekcLm4WFOga83Fq16QlbFngUSvseZszPXLrVtx2GLeC HwCfbGLG7dj0AqKXgX/VTH2+RMgyQJi+a/opFEg+X2I3I5EE613J2muefXGqvjhqrI8GsU ARRJgtTprVYh4m4D3jfzHh6B4HvDITk64/K/Y3vF7rhAzVpzCK1GrwX4DF0yYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750417851; 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=2MG/mj1pnqo1+UiMPi6pUk3HSPecmlqfpXt1d9axCu0=; b=qM+eza8uVNo8FjbboUmwkM7eY7fgv03H6gR9tvvQNL+1HDNOBYoMjlIaCfBcxbFxxXqK1e ktBAVIOrhmwgtALsAw4UGZ0b//MGPo+/yf0wAk4UtdERDqqRf/z5h5KAGBGQDlZYvBksu6 /5bH7er28VSUppteKMjya594bt0XbSHplrstWJjwpM1NP2Dc6K1C/yhUcahM837sZwbTCp DcVmN6GCf9GZudLE+3LIYIvc6HM28DfbdcEWMB5RLeucYuI3xYBLdhAAwGCDMOor7C93Nk oV4bs63IQI7ownM0KEU995MDzbkuMQpqBuhOFkTHKaJ3Ipjb6LCmGSQRlPs0GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750417851; a=rsa-sha256; cv=none; b=s8xPCOIHYC5khMpIgIYQJi/Lxvk6h/xq8uTBGwkffvCt5WATHksOmLPZKlQoJ7BbmvuuDY 8dWYVk6luuNER+FQ5JOobTMNNxSCo4CdnL91Rv2as2Yr+yuRNvW9KbMALBpMENLRJxawU9 vnnbP1HaMuvax8NlsWAqjijypAA6xT6lff0LFXoum7XOP5RFFVJ6PN+4rKHVhzd5Hs17/U rWRIV42TDTie0n47MQgCxmGElB3UDwEQB+JydY3WxNA0l6pHS4uVMWWzQr8e+VZy0dJ2E5 9+mxrsrEwixDVnKVE9tZ0Db3C8rbGWcmfFVqTH4DEVLJADc9IVWxG9VETM9xKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bNvsl3Z4HzjYx; Fri, 20 Jun 2025 11:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55KBAp9N051269; Fri, 20 Jun 2025 11:10:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KBApY4051266; Fri, 20 Jun 2025 11:10:51 GMT (envelope-from git) Date: Fri, 20 Jun 2025 11:10:51 GMT Message-Id: <202506201110.55KBApY4051266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 42092e1b6625 - main - diff: Detect loops when diffing directories. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 42092e1b6625b8226de5f34d22b9a96c713626cb Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=42092e1b6625b8226de5f34d22b9a96c713626cb commit 42092e1b6625b8226de5f34d22b9a96c713626cb Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 11:10:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-20 11:10:35 +0000 diff: Detect loops when diffing directories. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50936 --- 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 8d12e868f90e..df65a84ca391 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -21,10 +21,12 @@ */ #include +#include #include #include #include +#include #include #include #include @@ -41,6 +43,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. */ @@ -61,26 +118,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; @@ -92,7 +145,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; @@ -114,6 +167,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 ab731fa32d26..691b649813a1 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() { @@ -364,6 +365,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 @@ -390,4 +406,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 }