From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEC5AC4338F for ; Wed, 11 Aug 2021 08:15:24 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 349CF60FC0 for ; Wed, 11 Aug 2021 08:15:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 349CF60FC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 13FCC82D5B; Wed, 11 Aug 2021 10:15:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="UE3704Qo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 16C9982D5B; Wed, 11 Aug 2021 10:14:52 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4699782C89 for ; Wed, 11 Aug 2021 10:14:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 890E560EB5; Wed, 11 Aug 2021 08:14:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628669677; bh=iOKkOF6GuE9oLP/3UQ8umumoisOmebqU1RKKrgtEttk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UE3704Qo3LsBxN8XN2ZlybUb47I1FFYdtphHs+EiCT829rqBkRjTxmoqHWqsieymi 40B1ALX4+2sGGkDI/BlLfZCngkCdjFQvnXUvVzjYdmr4BsFkg3JE1p6UApISp3fnVa PFRTp+5NPkGjjsB52SoroL9zJ4BsNXXaRrXL+xtWfqn0RAJNAAwAlOx7M7UmcMiAzz sjgWD1M6qBa7cty2jcTxn0RD0bpswc6KYZiZAhRQiwuVk+f6/GAC5h95I/jHoqF5+q ExgI925GetwLO7Io4L+m5N8CO5ireEu4tFEFy8YO7E3JbSxdATGKEk7lcBTdO/z22E hXTryc1O+rQYg== Received: by pali.im (Postfix) id 9F82FADB; Wed, 11 Aug 2021 10:14:35 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Stefan Roese Cc: u-boot@lists.denx.de, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 2/4] tools: kwbimage: Verify size of v0 image header Date: Wed, 11 Aug 2021 10:14:15 +0200 Message-Id: <20210811081417.18010-2-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210811081417.18010-1-pali@kernel.org> References: <20210811081417.18010-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Check that extended image header size is not larger than file size. Signed-off-by: Pali Rohár --- tools/kwbimage.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 80aae8a6b619..84c41210e39e 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -1682,6 +1682,9 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size, if (mhdr->ext & 0x1) { struct ext_hdr_v0 *ext_hdr; + if (header_size + sizeof(*ext_hdr) > image_size) + return -FDT_ERR_BADSTRUCTURE; + ext_hdr = (struct ext_hdr_v0 *) (ptr + sizeof(struct main_hdr_v0)); checksum = image_checksum8(ext_hdr, -- 2.20.1