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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DF88BC32772 for ; Tue, 23 Aug 2022 12:52:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38BA583FB5; Tue, 23 Aug 2022 14:52:41 +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="s/d+ZNyV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 693EF83FB5; Tue, 23 Aug 2022 14:52:39 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (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 4745683F8C for ; Tue, 23 Aug 2022 14:52:36 +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: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2CE4F614A1; Tue, 23 Aug 2022 12:52:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B556C433C1; Tue, 23 Aug 2022 12:52:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661259154; bh=PMHYpDvz7K4YCOTLo4elo6pWQuaFBRj7YLmohgPzJhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s/d+ZNyVJ1wk/kCIpqEIyY2+eUb55zbmg0kPceGZ2aaU9/M/SDdsZYdHKqv7KhL7M BRTWihLNlN0Mei0zbWF1+WkENQjVhdqL75V0gaF1HwIWXesetAeTMopkXpUQp62FVe xok6sMp5/SdkjL/kaRFDNgjwH1WSOUF1XKNCfwKdd13E+Emm6lUWQLBvSBhMK8IMbM ookMvtPpNwfVyxWVy+uGL6Z8kEPFEFsqxG6jMRGMuc/cNKfbKA4SzC3IXritEx6VSW mcjiDkk7XzJPPF8qOKaVQFj2VnCvtkbLbbfb14WX8SmhzcEvmV5vz1JXWDYQBAZXbT Qv+sA6gpk7sbA== Received: by pali.im (Postfix) id E0E70621; Tue, 23 Aug 2022 14:52:31 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Stefan Roese Cc: u-boot@lists.denx.de Subject: [PATCH v3 1/2] cmd: mvebu/bubt: Check for A38x image data checksum Date: Tue, 23 Aug 2022 14:52:23 +0200 Message-Id: <20220823125224.20638-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220805154819.4924-1-pali@kernel.org> References: <20220805154819.4924-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.39 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.6 at phobos.denx.de X-Virus-Status: Clean Currently for A38x image is checked only header checksum. So check also for image data checksum to prevent flashing broken image. Signed-off-by: Pali Rohár Reviewed-by: Stefan Roese --- Changes in v3: * Compile fix (move another code chunk from patch 2/2 to 1/2) Changes in v2: * Compile fix (move code chunk from patch 2/2 to 1/2) --- cmd/mvebu/bubt.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index 2136af64163c..a97e5ce38a5e 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -688,9 +688,25 @@ static uint8_t image_checksum8(const void *start, size_t len) return csum; } +static uint32_t image_checksum32(const void *start, size_t len) +{ + u32 csum = 0; + const u32 *p = start; + + while (len) { + csum += *p; + ++p; + len -= sizeof(u32); + } + + return csum; +} + static int check_image_header(void) { u8 checksum; + u32 checksum32, exp_checksum32; + u32 offset, size; const struct a38x_main_hdr_v1 *hdr = (struct a38x_main_hdr_v1 *)get_load_addr(); const size_t image_size = a38x_header_size(hdr); @@ -701,11 +717,39 @@ static int check_image_header(void) checksum = image_checksum8(hdr, image_size); checksum -= hdr->checksum; if (checksum != hdr->checksum) { - printf("Error: Bad A38x image checksum. 0x%x != 0x%x\n", + printf("Error: Bad A38x image header checksum. 0x%x != 0x%x\n", checksum, hdr->checksum); return -ENOEXEC; } + offset = le32_to_cpu(hdr->srcaddr); + size = le32_to_cpu(hdr->blocksize); + + if (hdr->blockid == 0x78) { /* SATA id */ + if (offset < 1) { + printf("Error: Bad A38x image srcaddr.\n"); + return -ENOEXEC; + } + offset -= 1; + offset *= 512; + } + + if (hdr->blockid == 0xAE) /* SDIO id */ + offset *= 512; + + if (offset % 4 != 0 || size < 4 || size % 4 != 0) { + printf("Error: Bad A38x image blocksize.\n"); + return -ENOEXEC; + } + + checksum32 = image_checksum32((u8 *)hdr + offset, size - 4); + exp_checksum32 = *(u32 *)((u8 *)hdr + offset + size - 4); + if (checksum32 != exp_checksum32) { + printf("Error: Bad A38x image data checksum. 0x%08x != 0x%08x\n", + checksum32, exp_checksum32); + return -ENOEXEC; + } + printf("Image checksum...OK!\n"); return 0; } -- 2.20.1