mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v4 49/54] scripts: imx-image: Limit v2 header size to HEADER_LEN
Date: Mon, 11 Jun 2018 18:53:21 -0700	[thread overview]
Message-ID: <20180612015326.26192-50-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180612015326.26192-1-andrew.smirnov@gmail.com>

Given the following:

 1. Assembly code, namely "b 0x1000" instruction, in bb_header[]
    assumes that i.MX image header occupies first HEADER_LEN bytes and
    bootloader executable is located right after.

 2. Code in imx_image_size() assumes that i.MX image header is
    HEADER_LEN bytes

 3. Original code handling v2 header allocated more than HEADER_LEN
    buffer to store IVT + boot data + DCD. However, the code writing
    that buffer to disk is only set up to use first HEADER_LEN bytes
    and to silently discard the rest as a side effect.

Let's be conservative and limit total size of v2 header to not exceed
Inital Load Region (4K or HEADER_LEN) to match what's being done for
v1.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 scripts/imx/imx-image.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index a8a26e0ee..294f51a90 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -35,7 +35,13 @@
 
 #include <include/filetype.h>
 
-#define MAX_DCD 1024
+#define FLASH_HEADER_OFFSET 0x400
+
+/*
+ * Conservative DCD element limit set to restriction v2 header size to
+ * HEADER_SIZE
+ */
+#define MAX_DCD ((HEADER_LEN - FLASH_HEADER_OFFSET - sizeof(struct imx_flash_header_v2)) / sizeof(u32))
 #define CSF_LEN 0x2000		/* length of the CSF (needed for HAB) */
 
 static uint32_t dcdtable[MAX_DCD];
@@ -50,7 +56,6 @@ static char *prgname;
  * ============================================================================
  */
 
-#define FLASH_HEADER_OFFSET 0x400
 
 static uint32_t bb_header[] = {
 	0xea0003fe,	/* b 0x1000 */
@@ -261,7 +266,7 @@ static int write_mem_v1(uint32_t addr, uint32_t val, int width, int set_bits, in
 	}
 
 	if (curdcd > MAX_DCD - 3) {
-		fprintf(stderr, "At maximum %d dcd entried are allowed\n", MAX_DCD);
+		fprintf(stderr, "At maximum %d dcd entried are allowed\n", (int)MAX_DCD);
 		return -ENOMEM;
 	}
 
@@ -383,7 +388,7 @@ static int write_mem_v2(uint32_t addr, uint32_t val, int width, int set_bits, in
 		cmd |= 1 << 3;
 
 	if (curdcd > MAX_DCD - 3) {
-		fprintf(stderr, "At maximum %d dcd entried are allowed\n", MAX_DCD);
+		fprintf(stderr, "At maximum %d dcd entried are allowed\n", (int)MAX_DCD);
 		return -ENOMEM;
 	}
 
@@ -454,7 +459,7 @@ static int check(const struct config_data *data, uint32_t cmd, uint32_t addr,
 		return -EINVAL;
 	}
 	if (curdcd > MAX_DCD - 3) {
-		fprintf(stderr, "At maximum %d dcd entried are allowed\n", MAX_DCD);
+		fprintf(stderr, "At maximum %d dcd entried are allowed\n", (int)MAX_DCD);
 		return -ENOMEM;
 	}
 
@@ -495,7 +500,7 @@ static int nop(const struct config_data *data)
 	case 2:
 		if (curdcd > MAX_DCD - 1) {
 			fprintf(stderr, "At maximum %d DCD entries allowed\n",
-				MAX_DCD);
+				(int)MAX_DCD);
 			return -ENOMEM;
 		}
 
@@ -780,12 +785,12 @@ int main(int argc, char *argv[])
 		exit(0);
 	}
 
+	buf = calloc(1, HEADER_LEN);
+	if (!buf)
+		exit(1);
+
 	switch (data.header_version) {
 	case 1:
-		buf = calloc(1, HEADER_LEN);
-		if (!buf)
-			exit(1);
-
 		add_header_v1(&data, buf);
 		if (data.srkfile) {
 			ret = add_srk(buf, data.image_dcd_offset, data.image_load_addr,
@@ -795,9 +800,11 @@ int main(int argc, char *argv[])
 		}
 		break;
 	case 2:
-		buf = calloc(1, data.image_dcd_offset + sizeof(struct imx_flash_header_v2) + MAX_DCD * sizeof(u32));
-		if (!buf)
+		if (data.image_dcd_offset + sizeof(struct imx_flash_header_v2) +
+		    MAX_DCD * sizeof(u32) > HEADER_LEN) {
+			fprintf(stderr, "i.MX v2 header exceeds SW limit set by imx-image\n");
 			exit(1);
+		}
 
 		add_header_v2(&data, buf);
 		break;
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-06-12  1:56 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-12  1:52 [PATCH v4 00/54] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 01/54] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 02/54] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 03/54] ARM: Add i.MX8 support Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 04/54] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 05/54] Include our own include/dt-bindings Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 06/54] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 07/54] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 08/54] net: fec_imx: Use dma mapping functions Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 09/54] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 10/54] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 11/54] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 12/54] mmc: i.MX esdhc: " Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 13/54] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 14/54] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 15/54] ARM: i.MX: Split shared CCM code into a separate file Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 16/54] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 17/54] ARM: i.MX: Add basic CCM " Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 18/54] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 19/54] clocksource: armv8-timer: Convert explicit assembly into helpers Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 20/54] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 21/54] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 22/54] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 23/54] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 24/54] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 25/54] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 26/54] pinctrl: i.MX: " Andrey Smirnov
2018-06-12  1:52 ` [PATCH v4 27/54] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 28/54] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 29/54] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 30/54] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 31/54] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 32/54] common/clock: Move delay and timeout functions to lib/ Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 33/54] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 34/54] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 35/54] Kbuild: Add $(quote) Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 36/54] Add builtin firmware support Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 37/54] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 38/54] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 39/54] ARM: lib64: Make string functions aware of MMU configuration Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 40/54] ARM: mmu: Make use of dsb() and isb() helpers Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 41/54] ARM: cache: Remove unused cache ops struct Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 42/54] ARM: no-mmu: Disable building for ARMv8 Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 43/54] ARM: interrupts64: Include ESR value in exception traceback Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 44/54] ARM: mmu64: Trivial code simplification Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 45/54] ARM: mmu64: Make use of create_table() Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 46/54] ARM: mmu64: Convert flags in arch_remap_range() Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 47/54] ARM: include: dma: Add missing no-MMU stubs Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 48/54] scripts: imx-image: Drop error return from write_dcd() Andrey Smirnov
2018-06-12  1:53 ` Andrey Smirnov [this message]
2018-06-12  1:53 ` [PATCH v4 50/54] scripts: imx-image: Use a loop to create multiple header copies Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 51/54] scripts: imx-image: Share the code to write barebox header Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 52/54] scripts: imx-image: Add i.MX8MQ support Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 53/54] ARM: i.MX8: Add i.MX8mq EVK support Andrey Smirnov
2018-06-12  2:58   ` Fabio Estevam
2018-06-12 14:52     ` Andrey Smirnov
2018-06-12  5:49   ` Holger Schurig
2018-06-12 14:53     ` Andrey Smirnov
2018-06-12  1:53 ` [PATCH v4 54/54] ARM: Introduce imx_v8_defconfig Andrey Smirnov

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=20180612015326.26192-50-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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