From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 16 Jan 2025 15:16:58 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tYQg6-000cvd-06 for lore@lore.pengutronix.de; Thu, 16 Jan 2025 15:16:58 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tYQg6-0003bN-3Q for lore@pengutronix.de; Thu, 16 Jan 2025 15:16:58 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HFwOKNvecqfxW8uMQ13nJO70GYZxR4Ruz1sxS5AhGIA=; b=fOmdv9+bpylq+f/Voz+yAam+L3 mjh6dtB2KLrpgiBde68ElE+Ji0Rl6juCN/J2oFv77JssvOkkapegI6c/md/iu2ztcYUuhu9cJkjNa tTvqvkwVb0fZjoFb6crv0EXsOSStUqysUzn2YDmz0kpsBY9E7iR7oKJ+96MMxRpz2+pa1CetH4CF2 IEKmzJ2CVI1J/Fuaqe8zoUFib3oriDPRV75e+BXjSrxoiPJH38CF4QQLh2nLgUkcJvkGr3n4ur467 UIOuz1Mg1tXNx9bjNf6twnZIA5ACLqeLKd3WqEz1iLSKX60YWNIyGXeZOiy+Uy2FvLCvvxGdkHooB NE76RFZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tYQfg-0000000F8Js-3b1J; Thu, 16 Jan 2025 14:16:32 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tYQfd-0000000F8JO-4475 for barebox@lists.infradead.org; Thu, 16 Jan 2025 14:16:31 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1tYQfc-0003YI-Nz for barebox@lists.infradead.org; Thu, 16 Jan 2025 15:16:28 +0100 Message-ID: <61646609-a2a6-4cda-82c9-09e6681cb005@pengutronix.de> Date: Thu, 16 Jan 2025 15:16:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: "barebox@lists.infradead.org" References: <20250116140831.298514-1-a.fatoum@pengutronix.de> Content-Language: en-US From: Ahmad Fatoum In-Reply-To: <20250116140831.298514-1-a.fatoum@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250116_061630_015620_083A61EE X-CRM114-Status: GOOD ( 21.12 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] booti: sanity check image magic before parsing header X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On 16.01.25 15:08, Ahmad Fatoum wrote: > booti_load_image is called directly for kernels in FIT images. > Let's have a simple check that the payload is indeed a booti > image before parsing it. > > Signed-off-by: Ahmad Fatoum filetype.h is also included from imx-image leading to warning there. I will fix this in v2. > --- > common/booti.c | 11 +++++++++-- > common/filetype.c | 6 +++--- > include/filetype.h | 11 +++++++++++ > 3 files changed, 23 insertions(+), 5 deletions(-) > > diff --git a/common/booti.c b/common/booti.c > index e745ff696376..4c2033b7de0e 100644 > --- a/common/booti.c > +++ b/common/booti.c > @@ -4,6 +4,7 @@ > #define pr_fmt(fmt) "booti: " fmt > > #include > +#include > #include > #include > #include > @@ -38,13 +39,19 @@ void *booti_load_image(struct image_data *data, phys_addr_t *oftree) > int ret; > void *fdt; > > + print_hex_dump_bytes("header ", DUMP_PREFIX_OFFSET, kernel_header, 80); > + > + if ((IS_ENABLED(CONFIG_RISCV) && !is_riscv_linux_bootimage(kernel_header)) || > + (IS_ENABLED(CONFIG_ARM64) && !is_arm64_linux_bootimage(kernel_header))) { > + pr_err("Unexpected magic at offset 0x38!\n"); > + return ERR_PTR(-EINVAL); > + } > + > text_offset = le64_to_cpup(kernel_header + 8); > image_size = le64_to_cpup(kernel_header + 16); > > kernel = get_kernel_address(data->os_address, text_offset); > > - print_hex_dump_bytes("header ", DUMP_PREFIX_OFFSET, > - kernel_header, 80); > pr_debug("Kernel to be loaded to %lx+%lx\n", kernel, image_size); > > if (kernel == UIMAGE_INVALID_ADDRESS) > diff --git a/common/filetype.c b/common/filetype.c > index 73ea17e19bd7..2a68879ee5de 100644 > --- a/common/filetype.c > +++ b/common/filetype.c > @@ -365,11 +365,11 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize) > if (bufsize < 64) > return filetype_unknown; > > - if (le32_to_cpu(buf[14]) == 0x644d5241) > + if (is_arm64_linux_bootimage(buf)) > return is_dos_exe(buf8) ? filetype_arm64_efi_linux_image : filetype_arm64_linux_image; > - if (le32_to_cpu(buf[14]) == 0x05435352) > + if (is_riscv_linux_bootimage(buf)) > return is_dos_exe(buf8) ? filetype_riscv_efi_linux_image : filetype_riscv_linux_image; > - if (le32_to_cpu(buf[14]) == 0x56435352 && !memcmp(&buf[12], "barebox", 8)) > + if (is_riscv_linux_bootimage(buf) && !memcmp(&buf[12], "barebox", 8)) > return filetype_riscv_barebox_image; > > if (le32_to_cpu(buf[5]) == 0x504d5453) > diff --git a/include/filetype.h b/include/filetype.h > index c24d061e8ffa..d445140edba1 100644 > --- a/include/filetype.h > +++ b/include/filetype.h > @@ -4,6 +4,7 @@ > > #include > #include > +#include > > /* > * List of file types we know > @@ -134,4 +135,14 @@ static inline int is_barebox_head(const char *head) > return is_barebox_arm_head(head) || is_barebox_mips_head(head); > } > > +static inline bool is_arm64_linux_bootimage(const void *header) > +{ > + return le32_to_cpup(header + 56) == 0x644d5241; > +} > + > +static inline bool is_riscv_linux_bootimage(const void *header) > +{ > + return le32_to_cpup(header + 56) == 0x05435352; > +} > + > #endif /* __FILE_TYPE_H */ -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |