mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 08/15] ARM: i.MX bbu-external-nand: Do not modify image
Date: Mon, 17 May 2021 20:54:17 +0200	[thread overview]
Message-ID: <20210517185424.32145-9-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210517185424.32145-1-s.hauer@pengutronix.de>

struct bbu_data::image is const, so do not modify the image, but create
a copy instead.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/mach-imx/imx-bbu-external-nand.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/imx-bbu-external-nand.c b/arch/arm/mach-imx/imx-bbu-external-nand.c
index 8aa4f152a1..0f7cc51caf 100644
--- a/arch/arm/mach-imx/imx-bbu-external-nand.c
+++ b/arch/arm/mach-imx/imx-bbu-external-nand.c
@@ -39,7 +39,7 @@ static int imx_bbu_external_nand_update(struct bbu_handler *handler, struct bbu_
 	uint32_t num_bb = 0, bbt = 0;
 	loff_t offset = 0;
 	int block = 0, len, now, blocksize;
-	void *image = data->image;
+	void *image = NULL;
 
 	ret = stat(data->devicefile, &s);
 	if (ret)
@@ -55,6 +55,12 @@ static int imx_bbu_external_nand_update(struct bbu_handler *handler, struct bbu_
 	if (ret)
 		goto out;
 
+	image = memdup(data->image, data->len);
+	if (!image) {
+		ret = -ENOMEM;
+		goto out;
+	}
+
 	blocksize = meminfo.erasesize;
 
 	size_need = data->len;
@@ -172,6 +178,7 @@ static int imx_bbu_external_nand_update(struct bbu_handler *handler, struct bbu_
 
 out:
 	close(fd);
+	free(image);
 
 	return ret;
 }
-- 
2.29.2


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


  parent reply	other threads:[~2021-05-17 18:56 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17 18:54 [PATCH 00/15] Compiler warning fixes Sascha Hauer
2021-05-17 18:54 ` [PATCH 01/15] arm: friendlyarm-tiny210: Remove dead code Sascha Hauer
2021-05-17 18:54 ` [PATCH 02/15] ARM: socfpga: Fix timeout tests Sascha Hauer
2021-05-17 18:54 ` [PATCH 03/15] i.MX FCB: Fix error checking Sascha Hauer
2021-05-17 18:54 ` [PATCH 04/15] clk: tegra: Fix -Wtype-limits compiler warning Sascha Hauer
2021-05-17 18:54 ` [PATCH 05/15] ARM: i.MX: xload-gpmi: Fix " Sascha Hauer
2021-05-17 18:54 ` [PATCH 06/15] mtd: cfi-flash: " Sascha Hauer
2021-05-17 18:54 ` [PATCH 07/15] pci: mvebu: Fix wrong error check Sascha Hauer
2021-05-17 18:54 ` Sascha Hauer [this message]
2021-05-17 18:54 ` [PATCH 09/15] ARM: layerscape: " Sascha Hauer
2021-05-17 18:54 ` [PATCH 10/15] ARM: phytec-phycard-omap3: Fix checking of unsigned variable being negative Sascha Hauer
2021-05-17 18:54 ` [PATCH 11/15] scripts: zynq_mkimage: Make locally used function static Sascha Hauer
2021-05-17 18:54 ` [PATCH 12/15] ARM: module: Remove always false check Sascha Hauer
2021-05-17 18:54 ` [PATCH 13/15] aiodev: lm75: Handle unknown lm75 types Sascha Hauer
2021-05-17 18:54 ` [PATCH 14/15] clk: zynqmp: Fix wrong error check Sascha Hauer
2021-05-17 18:54 ` [PATCH 15/15] powerpc: law: use signed type to allow error checking Sascha Hauer

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=20210517185424.32145-9-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH 08/15] ARM: i.MX bbu-external-nand: Do not modify image' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox