From nobody Thu Mar 23 21:56:58 2023 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 4PjK1k3n4fz40NQK; Thu, 23 Mar 2023 21:56:58 +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 4PjK1k3CHLz4Hlh; Thu, 23 Mar 2023 21:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679608618; 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=8Eb7JYRkMujqtKzrRQ5ZQ5BN8slPIHzGKG2JefYHmBs=; b=g3VQJ2q+iJVRT6OxuRj56CezQh7sJgjbMNiXJ3/XEpwr0yg76aGUuH76zF3I0LsrbPzVXk UrnEnZJ/dm8y+QrdMvb+/cKmfEsRvAVNU4smN1YuU6kSEcm57Hopa+c4mS0VyL7Y/KNewb kaM6Y0w3/x8oLu34OF6H/Wwyd4hQveCRP89OWi9gaxZWaROe3fqXNzDusucJA/H1cZt5bW mWeshjrAxwmoCpssbNyo/r2cgpbBygGZ7FFtinbsySSGwQueTLTUS4m9BoImlyyC0jvRQu Y/zvmcCCOX7eBqK3y04gfUtrAQcS8yBSIlZSc/Nr1XD1t6i5Zk9nqCpfGXKDwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679608618; 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=8Eb7JYRkMujqtKzrRQ5ZQ5BN8slPIHzGKG2JefYHmBs=; b=xuowrnhROiRuy/KirmHExSSc9hProgrxwmgy+ydSOA7dr6hH3S4tyjYjEfLwQrXzhubNB0 gvgFx5YpBxyD8QDdGHJHM7Ymkh9sKKSyzw3L7xHQ148hxjuiioqWqkPwGIVcHCXP2zbKuC PrTVp/vMqjgzoBSP5yI2PUjG1XnlXmBbHJbk/zFoFVQNDHcd4+mg8B2CJPc/tU0pg4W9Tt HFfshBC0JM/UyiDFP0V+EqyZU3RZE5yFmJPRL+PZXUj9+GbxleZQXXf5X/FQebb3nQoyQ6 Qc9JqvB3L4mQRkW2S9hTyF+CkvmBUZZlmQhxuDJL/c7o26SWFZcNKKe1OGo/pQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679608618; a=rsa-sha256; cv=none; b=rB0fhBlRDl+rYfPfXcN21lAuuLXwM1XQukFNCh5eBpymL2CK7g6BwX8+SXqJ0WJXjaTvSr Jd7xpLh8WHHS6kOM9w3u2IADJTnLAoocPsBt/kwHgYDTPtl9hmGtzfhoc20KC1D1weuTaB xSorU/Ar87dqOM5Y6tKukx85dVFWrWoivbMCK1j1Daw5MJ3xEN5bBp7XR1R71SSXLotcY7 2CdorxFXhofhW4c891Rhuf1zG/GQBL58M23HY6Xm+/Z7JoW7G3oxx/XbxKbaBQMyEAlFjT klkuwVUVG+nGvOYxmF8EdMRu6nZ6ZVsygkxFIDRImF9ByFZN95Tx4P5J6dWx8Q== 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 4PjK1k2CyhzsND; Thu, 23 Mar 2023 21:56:58 +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 32NLuwXr018297; Thu, 23 Mar 2023 21:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NLuw9U018296; Thu, 23 Mar 2023 21:56:58 GMT (envelope-from git) Date: Thu, 23 Mar 2023 21:56:58 GMT Message-Id: <202303232156.32NLuw9U018296@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: 9f2a52536047 - main - makefs: correct El Torito bood record 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 9f2a525360473a778f91021e3be58fd4bfd72ee5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2a525360473a778f91021e3be58fd4bfd72ee5 commit 9f2a525360473a778f91021e3be58fd4bfd72ee5 Author: Ed Maste AuthorDate: 2023-03-23 17:02:44 +0000 Commit: Ed Maste CommitDate: 2023-03-23 21:56:33 +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 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 --- 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 */