From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 14 Apr 2026 10:47:53 +0200 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 1wCZR3-00C1GH-0v for lore@lore.pengutronix.de; Tue, 14 Apr 2026 10:47:53 +0200 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 1wCZR2-0008J1-JP for lore@pengutronix.de; Tue, 14 Apr 2026 10:47:53 +0200 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:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AOsBmFJ4bItehtSC22tH96WwTW6n0e5YDXS8uiOL68c=; b=pAXxAUUMT8T87YX0O8RzRh2R7u mHCdpNj8lknOWRoneOM19YcqIxPxqjdsmPicEAlQxzsO4jcAcIWz9BqD/rK4Vj/MAnmjM6EM3bTZT WMZdJk4cPbLwqjpDWL/ScM9xKac311iTMH4rXNwSk8TVV1WZMp/YByikDVXjp9Tcama1Tx8+NP/c5 7RHD2idIJsWW8J7fmiVIRyvkMNCAgw7DFdJz5tL9/LoGSXXKjTsrF5YeqL8mzxD720nQHPEkCnqGr q0Z2QeZ1moLmuYA6sjENxefBQzK/8aokXJ7kM0HWtUlVzQCATazCaYn3MnC1POMwUG6N5c+nFWq+r ju8OlSgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCZQh-0000000H0rv-1uvg; Tue, 14 Apr 2026 08:47:31 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCZQe-0000000H0rM-2Gp0 for barebox@lists.infradead.org; Tue, 14 Apr 2026 08:47:29 +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 1wCZQd-0008El-1Y; Tue, 14 Apr 2026 10:47:27 +0200 Message-ID: <708cbd6c-8749-4b80-90bd-09883817fb6f@pengutronix.de> Date: Tue, 14 Apr 2026 10:47:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Sascha Hauer , Barebox List Cc: Sascha Hauer , "Claude Opus 4.6 (1M context)" References: <20260413123646.3552086-1-s.hauer@pengutronix.de> <20260413123646.3552086-3-s.hauer@pengutronix.de> From: Ahmad Fatoum Content-Language: en-US, de-DE, de-BE In-Reply-To: <20260413123646.3552086-3-s.hauer@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-20260414_014728_581897_0A47F19D X-CRM114-Status: GOOD ( 18.96 ) 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.2 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 3/4] efi: loader: fix SizeOfBlock underflow in relocation processing 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 4/13/26 2:36 PM, Sascha Hauer wrote: > From: Sascha Hauer > > rel->SizeOfBlock is a uint32_t read from the PE image. If it is smaller > than sizeof(IMAGE_BASE_RELOCATION) (8 bytes), the subtraction > SizeOfBlock - sizeof(*rel) underflows. On 32-bit architectures (ARM, > i386, riscv32) the resulting huge unsigned value divided by 2 fits in a > positive int, causing the relocation loop to iterate billions of times, > reading and writing far past the relocation block. > > Reject relocation blocks with SizeOfBlock smaller than the base > relocation header. > > Signed-off-by: Sascha Hauer > > Co-Authored-By: Claude Opus 4.6 (1M context) Reviewed-by: Ahmad Fatoum > --- > efi/loader/pe.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/efi/loader/pe.c b/efi/loader/pe.c > index 3190718df5..ea385c8795 100644 > --- a/efi/loader/pe.c > +++ b/efi/loader/pe.c > @@ -120,6 +120,10 @@ static efi_status_t efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, > end = (const IMAGE_BASE_RELOCATION *)((const char *)rel + rel_size); > while (rel + 1 < end && rel->SizeOfBlock) { > const uint16_t *relocs = (const uint16_t *)(rel + 1); > + > + if (rel->SizeOfBlock < sizeof(*rel)) > + return EFI_LOAD_ERROR; > + > i = (rel->SizeOfBlock - sizeof(*rel)) / sizeof(uint16_t); > while (i--) { > uint32_t offset = (uint32_t)(*relocs & 0xfff) + -- 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 |