From: Pali Rohár <pali@kernel.org>
Date: Sun, 8 Jan 2023 12:18:39 +0000 (+0100)
Subject: cmd: mvebu/bubt: Fix parsing SDIO kwbimage
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=eb2c8f3805082955a95485911962b2baa8ab54ce;p=u-boot.git

cmd: mvebu/bubt: Fix parsing SDIO kwbimage

Despite the official specification, Marvell BootROM does not interpret
srcaddr from SDIO image as offset in number of sectors (like for SATA
image), but as offset in bytes (like for all other images except SATA).

To ensure that we do not store invalid SDIO image to the boot location
(read by the Marvell BootROM), we need to check that image is valid
and srcaddr is intepreted in bytes, in the same way as it is done by
Marvell BootROM.

This fixes rejecting valid and accepting invalid SDIO images by bubt command.

Fixes: 5a0653493307 ("cmd: mvebu/bubt: Check for A38x image data checksum")
Signed-off-by: Pali Rohár <pali@kernel.org>
---

diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
index 1efbe2e607..6bb84da03e 100644
--- a/cmd/mvebu/bubt.c
+++ b/cmd/mvebu/bubt.c
@@ -747,9 +747,6 @@ static int check_image_header(void)
 		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;