u-boot.lists.denx.de archive mirror
 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 v2 5/9] arm: mvebu: Check for kwbimage data checksum
Date: Fri, 26 Nov 2021 15:37:34 +0100	[thread overview]
Message-ID: <20211126143738.23830-6-kabel@kernel.org> (raw)
In-Reply-To: <20211126143738.23830-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>
Reviewed-by: Stefan Roese <sr@denx.de>
---
Changes since v1:
- changed uint32_t to u32
---
 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 4af52c626c..af9e45ac7a 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -100,6 +100,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.32.0


  parent reply	other threads:[~2021-11-26 14:38 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-26 14:37 [PATCH u-boot-marvell v2 0/9] More verifications for kwbimage in SPL Marek Behún
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 1/9] arm: mvebu: Check that kwbimage offset and blocksize are valid Marek Behún
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 2/9] SPL: Add struct spl_boot_device parameter into spl_parse_board_header() Marek Behún
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 3/9] arm: mvebu: Check that kwbimage blockid matches boot mode Marek Behún
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 4/9] SPL: Add support for checking board / BootROM specific image types Marek Behún
2021-11-26 14:37 ` Marek Behún [this message]
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 6/9] arm: mvebu: spl: Print srcaddr in error message Marek Behún
2021-11-30  6:20   ` Stefan Roese
2021-12-14 11:10   ` Pali Rohár
2021-12-14 13:11     ` Marek Behún
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 7/9] arm: mvebu: spl: Use preferred types u8/u16/u32 instead of uintN_t Marek Behún
2021-11-30  6:20   ` Stefan Roese
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 8/9] arm: mvebu: spl: Use IS_ENABLED() instead of #ifdef where possible Marek Behún
2021-11-30  6:22   ` Stefan Roese
2021-12-14  9:36   ` Pali Rohár
2021-12-14  9:45     ` Marek Behún
2021-12-14 11:12       ` Pali Rohár
2021-12-14 12:45         ` Marek Behún
2021-12-14 12:48           ` Stefan Roese
2021-12-14 13:01             ` Marek Behún
2021-12-16 18:16               ` Pali Rohár
2021-12-16 22:09                 ` Marek Behún
2021-12-16 22:17                   ` Marek Behún
2021-11-26 14:37 ` [PATCH u-boot-marvell v2 9/9] arm: mvebu: spl: Fix 100 column exceeds Marek Behún
2021-11-30  6:22   ` 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=20211126143738.23830-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).