From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de, Tom Rini <trini@konsulko.com>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Harald Seiler <hws@denx.de>, Simon Glass <sjg@chromium.org>,
Sean Anderson <seanga2@gmail.com>,
Michael Trimarchi <michael@amarulasolutions.com>,
Roger Quadros <rogerq@kernel.org>
Subject: [PATCH 02/26] spl: nor: Don't allocate header on stack
Date: Wed, 11 Oct 2023 21:56:02 -0400 [thread overview]
Message-ID: <20231012015626.3487451-3-seanga2@gmail.com> (raw)
In-Reply-To: <20231012015626.3487451-1-seanga2@gmail.com>
spl_image_info.name contains a reference to legacy_img_hdr. If we allocate
the latter on the stack, it will be clobbered after we return. This was
addressed for NAND back in 06377c5a1fc ("spl: spl_legacy: Fix NAND boot on
OMAP3 BeagleBoard"), but that commit didn't fix NOR.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
---
common/spl/spl_nor.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index 79d4f1d7aa8..c141a9ae629 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -26,7 +26,7 @@ unsigned long __weak spl_nor_get_uboot_base(void)
static int spl_nor_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
- __maybe_unused const struct legacy_img_hdr *header;
+ struct legacy_img_hdr *header;
__maybe_unused struct spl_load_info load;
/*
@@ -41,7 +41,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
* Load Linux from its location in NOR flash to its defined
* location in SDRAM
*/
- header = (const struct legacy_img_hdr *)CONFIG_SYS_OS_BASE;
+ header = (void *)CONFIG_SYS_OS_BASE;
#ifdef CONFIG_SPL_LOAD_FIT
if (image_get_magic(header) == FDT_MAGIC) {
int ret;
@@ -91,8 +91,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
* Load real U-Boot from its location in NOR flash to its
* defined location in SDRAM
*/
-#ifdef CONFIG_SPL_LOAD_FIT
header = (const struct legacy_img_hdr *)spl_nor_get_uboot_base();
+#ifdef CONFIG_SPL_LOAD_FIT
if (image_get_magic(header) == FDT_MAGIC) {
debug("Found FIT format U-Boot\n");
load.bl_len = 1;
@@ -111,14 +111,11 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
/* Legacy image handling */
if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_FORMAT)) {
- struct legacy_img_hdr hdr;
-
load.bl_len = 1;
load.read = spl_nor_load_read;
- spl_nor_load_read(&load, spl_nor_get_uboot_base(), sizeof(hdr), &hdr);
return spl_load_legacy_img(spl_image, bootdev, &load,
spl_nor_get_uboot_base(),
- &hdr);
+ header);
}
return -EINVAL;
--
2.37.1
next prev parent reply other threads:[~2023-10-12 2:15 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 1:56 [PATCH 00/26] test: spl: Test some load methods Sean Anderson
2023-10-12 1:56 ` [PATCH 01/26] spl: legacy: Fix referencing _image_binary_end Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:30 ` Sean Anderson
2023-10-12 15:28 ` Simon Glass
2023-10-12 1:56 ` Sean Anderson [this message]
2023-10-12 3:41 ` [PATCH 02/26] spl: nor: Don't allocate header on stack Simon Glass
2023-10-12 7:26 ` Michael Nazzareno Trimarchi
2023-10-12 1:56 ` [PATCH 03/26] spl: fit: Fix entry point for SPL_LOAD_FIT_FULL Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:28 ` Sean Anderson
2023-10-12 15:20 ` Tom Rini
2023-10-12 15:28 ` Simon Glass
2023-10-12 1:56 ` [PATCH 04/26] arm: imx: Fix i.MX8 container load address Sean Anderson
2023-10-12 1:56 ` [PATCH 05/26] arm: imx: Add newlines after error messages Sean Anderson
2023-10-12 7:33 ` Heinrich Schuchardt
2023-10-12 1:56 ` [PATCH 06/26] arm: imx: Add function to validate i.MX8 containers Sean Anderson
2023-10-12 1:56 ` [PATCH 07/26] arm: imx: Check header before calling spl_load_imx_container Sean Anderson
2023-10-12 7:44 ` Heinrich Schuchardt
2023-10-13 0:48 ` Sean Anderson
2023-10-12 16:40 ` Tom Rini
2023-10-13 1:39 ` Sean Anderson
2023-10-13 12:55 ` Tom Rini
2023-10-12 1:56 ` [PATCH 08/26] Move i.MX8 container image loading support to common/spl Sean Anderson
2023-10-12 1:56 ` [PATCH 09/26] spl: Allow enabling SPL_OF_REAL and SPL_OF_PLATDATA at the same time Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:22 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 10/26] lib: acpi: Fix linking SPL when ACPIGEN is enabled Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 11/26] fs: ext4: Fix building ext4 in SPL if write " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 12/26] fs: Compile in sandbox filesystem in SPL if it " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 6:39 ` Heinrich Schuchardt
2023-10-12 14:15 ` Sean Anderson
2023-10-12 14:50 ` Tom Rini
2023-10-12 14:52 ` Tom Rini
2023-10-12 1:56 ` [PATCH 13/26] net: Fix compiling SPL when fastboot " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 6:52 ` Heinrich Schuchardt
2023-10-12 14:16 ` Sean Anderson
2023-10-12 14:52 ` Tom Rini
2023-10-12 1:56 ` [PATCH 14/26] net: bootp: Move port numbers to header Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 6:53 ` Heinrich Schuchardt
2023-10-12 1:56 ` [PATCH 15/26] net: bootp: Fall back to BOOTP from DHCP when unit testing Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 7:16 ` Heinrich Schuchardt
2023-10-12 14:18 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 16/26] spl: Don't cache devices when UNIT_TEST is enabled Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:18 ` Sean Anderson
2023-10-12 7:23 ` Heinrich Schuchardt
2023-10-12 14:19 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 17/26] spl: Use map_sysmem where appropriate Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 18/26] test: spl: Split tests up and use some configs Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 19/26] test: spl: Fix spl_test_load not failing if fname doesn't exist Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 20/26] test: spl: Add functions to create images Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-13 19:44 ` [SPAM] " Xavier Drudis Ferran
2023-10-14 14:37 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 21/26] test: spl: Add functions to create filesystems Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:11 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 22/26] test: spl: Add a test for spl_blk_load_image Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:56 ` [PATCH 23/26] test: spl: Add a test for the MMC load method Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:12 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 24/26] test: spl: Add a test for the NET " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:11 ` Sean Anderson
2023-10-12 1:56 ` [PATCH 25/26] test: spl: Add a test for the NOR " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 4:16 ` Sean Anderson
2023-10-12 15:28 ` Simon Glass
2023-10-12 1:56 ` [PATCH 26/26] test: spl: Add a test for the SPI " Sean Anderson
2023-10-12 3:41 ` Simon Glass
2023-10-12 1:59 ` [PATCH 00/26] test: spl: Test some load methods Sean Anderson
2023-10-12 3:41 ` Simon Glass
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=20231012015626.3487451-3-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=hws@denx.de \
--cc=michael@amarulasolutions.com \
--cc=rogerq@kernel.org \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
--cc=xypron.glpk@gmx.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