All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Marek Behún" <kabel@kernel.org>
To: Stefan Roese <sr@denx.de>
Cc: u-boot@lists.denx.de, "Pali Rohár" <pali@kernel.org>,
	"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH u-boot-marvell 5/5] arm: mvebu: Check for kwbimage data checksum
Date: Thu, 11 Nov 2021 16:59:53 +0100	[thread overview]
Message-ID: <20211111155953.31526-6-kabel@kernel.org> (raw)
In-Reply-To: <20211111155953.31526-1-kabel@kernel.org>

From: Pali Rohár <pali@kernel.org>

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 <pali@kernel.org>
Signed-off-by: Marek Behún <marek.behun@nic.cz>
---
 arch/arm/mach-mvebu/spl.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 662f430503..f0b84167b9 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -100,6 +100,34 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
 }
 #endif
 
+static uint32_t checksum32(void *start, uint32_t len)
+{
+	uint32_t csum = 0;
+	uint32_t *p = start;
+
+	while (len > 0) {
+		csum += *p++;
+		len -= sizeof(uint32_t);
+	};
+
+	return csum;
+}
+
+int spl_check_board_image(struct spl_image_info *spl_image,
+			  const struct spl_boot_device *bootdev)
+{
+	uint32_t csum = *(uint32_t *)(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.32.0


  parent reply	other threads:[~2021-11-11 16:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-11 15:59 [PATCH u-boot-marvell 0/5] More verifications for kwbimage in SPL Marek Behún
2021-11-11 15:59 ` [PATCH u-boot-marvell 1/5] arm: mvebu: Check that kwbimage offset and blocksize are valid Marek Behún
2021-11-15  8:52   ` Stefan Roese
2021-11-11 15:59 ` [PATCH u-boot-marvell 2/5] SPL: Add struct spl_boot_device parameter into spl_parse_board_header() Marek Behún
2021-11-15  8:58   ` Stefan Roese
2021-11-11 15:59 ` [PATCH u-boot-marvell 3/5] arm: mvebu: Check that kwbimage blockid matches boot mode Marek Behún
2021-11-15  8:59   ` Stefan Roese
2021-11-11 15:59 ` [PATCH u-boot-marvell 4/5] SPL: Add support for checking board / BootROM specific image types Marek Behún
2021-11-15  9:09   ` Stefan Roese
2021-11-11 15:59 ` Marek Behún [this message]
2021-11-15  9:10   ` [PATCH u-boot-marvell 5/5] arm: mvebu: Check for kwbimage data checksum Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211111155953.31526-6-kabel@kernel.org \
    --to=kabel@kernel.org \
    --cc=marek.behun@nic.cz \
    --cc=pali@kernel.org \
    --cc=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.