From nobody Sat Mar 01 13:35:41 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 4Z4mL567WFz5VjRL; Sat, 01 Mar 2025 13:35:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z4mL524NPz3fNH; Sat, 01 Mar 2025 13:35:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740836141; 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=iEYO6t3Utso/Y5K5ZOoDoJT03gao8Aj/qF3uVSHaEYY=; b=vy7qIoCC+CZs6xQH9izuN4IGOVsNUjsZJ5cWCyMatcS1YfGj2ntsXHWQdyH33TqmAeEEL9 nOsru5VYPayuGHvmz7t0HnpayTxAxMiYM87cCULny6jG/2Voersy09UJR8/lijWWNqnJln teVQ0B76LjdLTTRl7LRSNrPLy9UXKWpR7+SIckOE6EkthSFfePEDl3gEgYEqX0XVs8nzX6 NH+XKLEJaiB0iqMEIeBLb2eqEiwjj+F7DWojyq5dUymZEwcfwZm0Iu4sn1vRuGjDlk2BIU 2BOfhAsLVCIFsYAlyPvmav7IgYBS0eIftABsBaD8VLJAmfc8s13G8l1BZ4VGVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740836141; a=rsa-sha256; cv=none; b=ZXhWCaM75DAvtOOojiTgvXqn++0MUsR2GRW+gI+3j0ksa5acG0VnZ9UXa4v4q4WYqNccS3 +h3QEzG2u5CpqXSpxrHirgehZMcj521slQe4xzo+a0nHCGhG8gCm2o5PBYvKIGD7cGsKOc sfF8ftp5kMrlSTx9w3Y5kbefyK0YF8KxyvNxx+guPjteo4j8TtzrJHJ4qiIl+QirlZxjao KtG5cFPrcQLNRtBktRUtD8Caf0YxB9VwPqM90UPQHodxuFFLRZxTOzx5ajEEqngC3kxOVk 5Y/6hC+fGKDKUIhOBF2ErFVVeTMiDn/F+b9K2hW1nlU1/3YkhMgclkL/5HQwzQ== 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=1740836141; 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=iEYO6t3Utso/Y5K5ZOoDoJT03gao8Aj/qF3uVSHaEYY=; b=TkxgTfwsYESy/7LtS2Q8fXFk+lG9+8Xl25g+xxN75SsLKy24aWvx9ayoxIj1WxbMPaDoI1 2KGYUkQEJ10qYPKWyBAhaB+K3C4W7F7/ViCv04QoMU5prOXBjs4I65f522eCNeBnPN2n16 CYsdsb4n0Xmlu2uPuCoh/U0f4pTb0lPuAbTnPUBym0DJtk/W6BDg9cxA/MBpLMuEyEYfKL ExUFjzZJYzXFBnGdPoh6K1kAvZ8b88ZoWxp2mrJuxieg2wvwBapBwejtXTZykNGDETKeAw YLiJp68jw584R+7cbQAZTiwD221a1UEyBcrSXHp+C25hY0hOi5RyO923DIxVqg== 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 4Z4mL51Zk6z2pt; Sat, 01 Mar 2025 13:35:41 +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 521DZfkI030948; Sat, 1 Mar 2025 13:35:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 521DZf8X030945; Sat, 1 Mar 2025 13:35:41 GMT (envelope-from git) Date: Sat, 1 Mar 2025 13:35:41 GMT Message-Id: <202503011335.521DZf8X030945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a18be39aafc1 - main - makefs: Initialize cd9660 inode map only once 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a18be39aafc1b55fd67603ee6a6d820d0fcd877f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a18be39aafc1b55fd67603ee6a6d820d0fcd877f commit a18be39aafc1b55fd67603ee6a6d820d0fcd877f Author: Ed Maste AuthorDate: 2025-03-01 13:30:52 +0000 Commit: Ed Maste CommitDate: 2025-03-01 13:35:15 +0000 makefs: Initialize cd9660 inode map only once Error introduced during a refactoring; cd9660_susp_initialize calls itself recursively. Sponsred by: The FreeBSD Foundation Fixes: 35a2e286157a ("makefs: Record inode for all entries in mtree mode") --- usr.sbin/makefs/cd9660/iso9660_rrip.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index 1b8ce42da4c0..31c6e38a96fe 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -70,8 +70,10 @@ cd9660_susp_initialize(iso9660_disk *diskStructure, cd9660node *node, if (node->dot_dot_record != 0) TAILQ_INIT(&(node->dot_dot_record->head)); - RB_INIT(&diskStructure->rr_inode_map); - diskStructure->rr_inode_next = 1; + if (diskStructure->rr_inode_next == 0) { + RB_INIT(&diskStructure->rr_inode_map); + diskStructure->rr_inode_next = 1; + } /* SUSP specific entries here */ if ((r = cd9660_susp_initialize_node(diskStructure, node)) < 0) @@ -121,11 +123,15 @@ cd9660_susp_finalize(iso9660_disk *diskStructure, cd9660node *node) if ((r = cd9660_susp_finalize(diskStructure, temp)) < 0) return r; } - RB_FOREACH_SAFE(mapnode, inode_map_tree, - &(diskStructure->rr_inode_map), mapnodetmp) { - RB_REMOVE(inode_map_tree, &(diskStructure->rr_inode_map), - mapnode); - free(mapnode); + + if (diskStructure->rr_inode_next != 0) { + RB_FOREACH_SAFE(mapnode, inode_map_tree, + &(diskStructure->rr_inode_map), mapnodetmp) { + RB_REMOVE(inode_map_tree, + &(diskStructure->rr_inode_map), mapnode); + free(mapnode); + } + diskStructure->rr_inode_next = 0; } return 1; }