summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2022-07-14 10:11:08 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2022-07-14 10:45:50 +0200
commit5ef180a46edf8d5041d1bc047fb65a8b47f785ad (patch)
tree925283517e9f60875e30817ce06d61ac7d2a0f78
parenta88050805ebb07f7fae1919ba21a6f1ed786a3c7 (diff)
downloadbarebox-5ef180a46edf8d5041d1bc047fb65a8b47f785ad.tar.gz
barebox-5ef180a46edf8d5041d1bc047fb65a8b47f785ad.tar.xz
ARM: imx/bbu-external-nand: Fix freeing image copy
imx_bbu_external_nand_update() does: image = memdup(data->image, data->len); ... for (...) { ... image += now; ... } ... free(image) So it's not the original pointer that is passed to free. This results in a hang. Instead use an offset variable and keep image constant. Fixes: 93b564d9acc7 ("ARM: i.MX bbu-external-nand: Do not modify image") Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.barebox.org/20220714081108.101094-2-u.kleine-koenig@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-imx/imx-bbu-external-nand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/imx-bbu-external-nand.c b/arch/arm/mach-imx/imx-bbu-external-nand.c
index 4d3493f9e1..40dbaabdc7 100644
--- a/arch/arm/mach-imx/imx-bbu-external-nand.c
+++ b/arch/arm/mach-imx/imx-bbu-external-nand.c
@@ -29,7 +29,7 @@ static int imx_bbu_external_nand_update(struct bbu_handler *handler, struct bbu_
int size_available, size_need;
int ret;
uint32_t num_bb = 0, bbt = 0;
- loff_t nand_offset = 0;
+ loff_t nand_offset = 0, image_offset = 0;
int block = 0, len, now, blocksize;
void *image = NULL;
@@ -157,12 +157,12 @@ static int imx_bbu_external_nand_update(struct bbu_handler *handler, struct bbu_
if (ret)
goto out;
- ret = write(fd, image, now);
+ ret = write(fd, image + image_offset, now);
if (ret < 0)
goto out;
len -= now;
- image += now;
+ image_offset += now;
nand_offset += now;
}