public inbox for u-boot@lists.denx.de
 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 1/5] arm: mvebu: Check that kwbimage offset and blocksize are valid
Date: Thu, 11 Nov 2021 16:59:49 +0100	[thread overview]
Message-ID: <20211111155953.31526-2-kabel@kernel.org> (raw)
In-Reply-To: <20211111155953.31526-1-kabel@kernel.org>

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

There are certain restrictions for kwbimage offset and blocksize.
Validate them.

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 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 73c4b9af3e..71994e44f1 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -163,6 +163,16 @@ int spl_parse_board_header(struct spl_image_info *spl_image,
 		spl_image->offset *= 512;
 #endif
 
+	if (spl_image->offset % 4 != 0) {
+		printf("ERROR: Wrong srcaddr in kwbimage\n");
+		return -EINVAL;
+	}
+
+	if (mhdr->blocksize <= 4 || mhdr->blocksize % 4 != 0) {
+		printf("ERROR: Wrong blocksize in kwbimage\n");
+		return -EINVAL;
+	}
+
 	spl_image->size = mhdr->blocksize;
 	spl_image->entry_point = mhdr->execaddr;
 	spl_image->load_addr = mhdr->destaddr;
-- 
2.32.0


  reply	other threads:[~2021-11-11 16:00 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 ` Marek Behún [this message]
2021-11-15  8:52   ` [PATCH u-boot-marvell 1/5] arm: mvebu: Check that kwbimage offset and blocksize are valid 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 ` [PATCH u-boot-marvell 5/5] arm: mvebu: Check for kwbimage data checksum Marek Behún
2021-11-15  9:10   ` 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-2-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