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 54DB6C433FE for ; Fri, 14 Jan 2022 13:35:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 328B983518; Fri, 14 Jan 2022 14:34:52 +0100 (CET) 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="IEfZIqtK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B6B0A83481; Fri, 14 Jan 2022 14:34:40 +0100 (CET) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (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 B1DB1834AA for ; Fri, 14 Jan 2022 14:34:25 +0100 (CET) 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 ams.source.kernel.org (Postfix) with ESMTPS id 5D993B825F7; Fri, 14 Jan 2022 13:34:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEDAAC36AFF; Fri, 14 Jan 2022 13:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642167264; bh=uzTDH/1KJ8ySa+wXgQTXVwreJar7RsmiKnOL1LZnwtg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IEfZIqtKjXpuhquDzuEc9gtLi+i6qOBHK5xu+oWe5xyVeN+fPl/ObhMFU1r8OMXCR MMZ4ChpDgsuOtFgDzMpiLbZ34ghqkCi7PQdSifX4OO0Sot/wbjzcttzpYMTcSlgmMb Bos9iPuHEaJfytOIQG8grIjQLnH/MhehBaNr+0SdW7/ow1fzoWTsbw5vkfTNJ1a27H Hs9Od95jDDAlDpckhjsCb4XK5JC1KTPiWtEXYn10/zSZl4YuRcmhwfOYzKT++6mmQj 5bWPMSRNGDHhiL8otovqq+ZeFmXnE9owCz1+ts0dLri2B2XB+cYTphC29kA7zTQ1id kj2ftRJcp+DgA== Received: by pali.im (Postfix) id 98CBF7D1; Fri, 14 Jan 2022 14:34:23 +0100 (CET) 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 u-boot-marvell v4 5/9] arm: mvebu: Check for kwbimage data checksum Date: Fri, 14 Jan 2022 14:31:41 +0100 Message-Id: <20220114133145.32329-6-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220114133145.32329-1-pali@kernel.org> References: <20220114133145.32329-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.2 at phobos.denx.de X-Virus-Status: Clean Last 4 bytes of kwbimage boot image is checksum. Verify it via the new spl_check_board_image() function which is called by U-Boot SPL after loading kwbimage. Signed-off-by: Pali Rohár Signed-off-by: Marek Behún Reviewed-by: Stefan Roese --- arch/arm/mach-mvebu/spl.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 62e4fe12d65c..72cc2f92f698 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -99,6 +99,33 @@ u32 spl_mmc_boot_mode(const u32 boot_device) } #endif +static u32 checksum32(void *start, u32 len) +{ + u32 csum = 0; + u32 *p = start; + + while (len > 0) { + csum += *p++; + len -= sizeof(u32); + }; + + return csum; +} + +int spl_check_board_image(struct spl_image_info *spl_image, + const struct spl_boot_device *bootdev) +{ + u32 csum = *(u32 *)(spl_image->load_addr + spl_image->size - 4); + + if (checksum32((void *)spl_image->load_addr, + spl_image->size - 4) != csum) { + printf("ERROR: Invalid data checksum in kwbimage\n"); + return -EINVAL; + } + + return 0; +} + int spl_parse_board_header(struct spl_image_info *spl_image, const struct spl_boot_device *bootdev, const void *image_header, size_t size) -- 2.20.1