From nobody Mon Apr 10 13:38:10 2023 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 4Pw95v3fsHz44G63; Mon, 10 Apr 2023 13:38:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pw95v1pkCz4PX9; Mon, 10 Apr 2023 13:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681133891; 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=F2yXmRluVoZWC0/PdTu9ypd4LWTvuI9ix0DhuA3qqlE=; b=eYudffVmTuvktxxTrRMJSusY4+BAImSS6HXsRtWa5bYWdQX5C7J2NWWZisyI197vcghTFz mu+u032gQg/1NJop+OJWuiBzXxKHf1d+CC7wKgV5zPv6NTHMRtMCIp4I7rIkD7h9WkUDel fkddqYWrUHK5oQOhf44muHYmsgdZ6qSvJdSIlY2LBXDlV8Svl7FPX8Bn9vGtAlWhRKim2n OAPCBDswge3D5mhBTMS5aHGf5wYScNiD5q+e5/JjlF/iAvaX3tg0jjZR4rdefj9WUJXitb MRqVfioKGj6VEf0D4bSXuzub+XkDf1SypZMprG5agMTQ2s9YYk7AaHBxTBazcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681133891; 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=F2yXmRluVoZWC0/PdTu9ypd4LWTvuI9ix0DhuA3qqlE=; b=j6ZGplcEUDVV/QxvwYzRtj7bqhQ/lmCdU/7uNgQSMiVB+j5Sb6ulB3XFGe9CgZdyVnDUly jMxe+u7MtFdeE0kt0+kogXqnsGukbsOZy0DUXMtO5JB8RMePBHt2yXh+yXe2MhQQ4qFyD/ VdP3+ewEyb0M510GB8Cq3TAFdRgyAuTzGRqsnnMSirzSbQlaLmEEM6HGD68VVvI29a6Bfj HC3YQiSeN+Cr84mH4o24uq0XEmgZixPvWaKZErl9mFqzT0WdHNpSX6Ze47yuyaxPMN1o/S Sp5xLreslY0SViqz+bw4AAEMEvNqewhzayNCzTYgzj8XRjV8BH2e+GchHuXsEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681133891; a=rsa-sha256; cv=none; b=nI4fp6tHf7s/4GrGqYDOUP0va4g/BRCso7cJsgipjaVB9EAP/GOKR8cVbo9rFoUZ7dzgEh MNs4k+nOxv+pYxf9UsVC5e0+cLUFslk9wHODV5Gm/sdTqsE9FVMYDFxlUnV6wHGLVqqNt9 aEXWkUzlZXhrg8Zt3bNiZV/9U5hwFa3eR/aTpv6RxRBw06iDGcxrwuOFG5TNYwQ9tjMwja 7aoimHmJWRTxLcEAVy3z1oVuwwaywm5suNb15BCJ4SyRuPRZdi0VwwyUUtEUdSoE8Es7Mn CWt62vPLwjgze0mr/t/gCgTfPFShlFWLuXrg0o67GtUkTXi8gg1kx1aMBCCIiA== 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 4Pw95v01dxzrnQ; Mon, 10 Apr 2023 13:38:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ADcAI2062838; Mon, 10 Apr 2023 13:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ADcA20062837; Mon, 10 Apr 2023 13:38:10 GMT (envelope-from git) Date: Mon, 10 Apr 2023 13:38:10 GMT Message-Id: <202304101338.33ADcA20062837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: b95746135307 - stable/13 - makefs: correct El Torito bood record 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: b95746135307c8146e342e55928bc27e1521f035 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b95746135307c8146e342e55928bc27e1521f035 commit b95746135307c8146e342e55928bc27e1521f035 Author: Ed Maste AuthorDate: 2023-03-23 17:02:44 +0000 Commit: Ed Maste CommitDate: 2023-04-10 13:37:40 +0000 makefs: correct El Torito bood record The boot catalog pointer is a DWord, but we previously populated it via cd9660_bothendian_dword which overwrote four unused bytes following it. See El Torito 1.0 (1995) Figure 7 for details. PR: 203531, 203646 Reported by: Coverity Scan Reported by: Thomas Schmitt Reviewed by: kevans CID: 977470 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39231 (cherry picked from commit 9f2a525360473a778f91021e3be58fd4bfd72ee5) --- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c index 3628a798db4c..b60e63ee1b53 100644 --- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c +++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c @@ -377,8 +377,8 @@ cd9660_setup_boot(iso9660_disk *diskStructure, int first_sector) /* Point to catalog: For now assume it consumes one sector */ ELTORITO_DPRINTF(("Boot catalog will go in sector %d\n", first_sector)); diskStructure->boot_catalog_sector = first_sector; - cd9660_bothendian_dword(first_sector, - diskStructure->boot_descriptor->boot_catalog_pointer); + cd9660_731(first_sector, + diskStructure->boot_descriptor->boot_catalog_pointer); /* Step 1: Generate boot catalog */ /* Step 1a: Validation entry */