From nobody Wed Mar 22 13:12:56 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 4PhTRX3G2zz40ps5; Wed, 22 Mar 2023 13:12:56 +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 4PhTRX2dcsz4V06; Wed, 22 Mar 2023 13:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679490776; 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=OLsV8N84YKa9u19MccWEBEZ2Ba6p9AtPJwPhhgHHvP8=; b=pOZTxMgQrxz6QCNmDIWuPPTdOwGCr+RUjSWsvJ7m5JJ353wdG2zFjyjschsQuYi7wCEa0w rLrG/nkK/G+yrQp6nh+wleAbhgD49CTzg4Mqni1etJmjcU1dMtX4GdXspDy5ivMdB1E1E6 jDU97cQ633r6uoTBnU0pLs+d4E38dYVipExMbuoLkrZbOoQUJiCrJwpP4Uxt1/yj+rRK7K 2zWc/uMZlhGt6s+mx6AaQ7hYLl6n6Stm7blLQyp5qJnD1TxTcryIajNnBNlnLMPTozr38U thmEIkc0uCvhIt2Q3xDXZp1XUx0b/kCBlJMRfB3Ll9TjzZpXQvyARS3U9eu1Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679490776; 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=OLsV8N84YKa9u19MccWEBEZ2Ba6p9AtPJwPhhgHHvP8=; b=gE7f+f9s5zxoSXfU/VbXica+0kPLjfsyXHl2GEVmGI9eSnbRp6DjQdFGlwV8Hmfz4uBTMJ NDJ7W5RX4POqo+0mN4kpTktjvW7UIgkFxvVCnDBmEcmzKhZsphdLoZnR6aMe2ydfxGRFAk raj8ZB1eMUiTXxBpKcKpG8vBs6DQnHTfeCvbGwNg0ODLsFh27jWf8R7YeNyN4udN6UEhvo DBsJUaIRhHZxQlAkmXx8DyqDE6M2naywuAjBU7LgtR54oShtIjbLtSVrS9oj5AcME99Jgp X0q0a90D10KmSW+O0JMfOKntVGzKBH1ajSR/+dGuudgtJmzBeao/6ad5CE0uZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679490776; a=rsa-sha256; cv=none; b=Qhe5V5P2OfWvRFdZc5SZovCz9gPIHeFKv0Hfo6ZVy1SZ707qQLw6dnBd8PrIrh0am8sfvC ZisydJ3R1AD0dFFnq1qxNBNPPISC+I57qM2i4+TUXi0coQ/2QHWUuty9xa2OgHOM1WC+sF EZ2jlPTl4js7cvFcfYuNUp3H1nwtAoP2aTe90FyuCj0JpPQVgJi3pnkik0rncH1ALT+Gnu yl8jpyif+S+ACri5OFp2DYU7xRxU4+2LiCe/wlGKrz3RxY2XPOgZKFFcwvrOqIHMNjKdvT DFh7No1vjhqySJ/A27TjVUN4KlktbyzdkVO2uTYAIVuZfsENCBZwjv5BkIc35w== 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 4PhTRX1j59zvSC; Wed, 22 Mar 2023 13:12:56 +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 32MDCuWX095673; Wed, 22 Mar 2023 13:12:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MDCuiE095672; Wed, 22 Mar 2023 13:12:56 GMT (envelope-from git) Date: Wed, 22 Mar 2023 13:12:56 GMT Message-Id: <202303221312.32MDCuiE095672@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: ddf77ec39271 - main - etdump: exit on error if section header or entry offset is OOB 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: ddf77ec392717e7eaf278c0f201b561afac97b87 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ddf77ec392717e7eaf278c0f201b561afac97b87 commit ddf77ec392717e7eaf278c0f201b561afac97b87 Author: Ed Maste AuthorDate: 2022-05-03 20:13:37 +0000 Commit: Ed Maste CommitDate: 2023-03-22 13:12:45 +0000 etdump: exit on error if section header or entry offset is OOB PR: 263663 Reported by: Robert Morris Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35868 --- usr.bin/etdump/etdump.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c index e536aa5e51cb..b234fc9d7ff8 100644 --- a/usr.bin/etdump/etdump.c +++ b/usr.bin/etdump/etdump.c @@ -116,8 +116,8 @@ boot_catalog_valid(char *entry) } static int -dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, - struct outputter *outputter) +dump_section(char *buffer, size_t bufsize, size_t offset, FILE *outfile, + const char *filename, struct outputter *outputter) { boot_catalog_section_header *sh; u_char platform_id; @@ -125,6 +125,8 @@ dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, size_t entry_offset; boot_catalog_section_entry *entry; + if (offset + sizeof(boot_catalog_section_header) > bufsize) + errx(1, "%s: section header out of bounds", filename); sh = (boot_catalog_section_header *)&buffer[offset]; if (outputter->output_section != NULL) { outputter->output_section(outfile, filename, sh); @@ -135,6 +137,10 @@ dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, if (outputter->output_entry != NULL) { for (i = 1; i <= (int)sh->num_section_entries[0]; i++) { entry_offset = offset + i * ET_BOOT_ENTRY_SIZE; + if (entry_offset + sizeof(boot_catalog_section_entry) > + bufsize) + errx(1, "%s: section entry out of bounds", + filename); entry = (boot_catalog_section_entry *)&buffer[entry_offset]; outputter->output_entry(outfile, filename, entry, @@ -195,8 +201,8 @@ dump_eltorito(FILE *iso, const char *filename, FILE *outfile, (uint8_t)entry[0] != ET_SECTION_HEADER_LAST) break; - entry_count = dump_section(buffer, offset, outfile, filename, - outputter); + entry_count = dump_section(buffer, sizeof(buffer), offset, + outfile, filename, outputter); offset += entry_count * ET_BOOT_ENTRY_SIZE; }