Verifying the uploaded image fails when the length is not word aligned.
This is because read_memory reads full words, so the input length must
be word aligned. Align the length up to 4 bytes so that we do not pass
unaligned lengths to read_memory.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
scripts/imx/imx-usb-loader.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index 43dde8b7f2..684e3f8a06 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -586,6 +586,8 @@ int do_status(void)
return err;
}
+#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
+
static int read_memory(unsigned addr, void *dest, unsigned cnt)
{
static struct sdp_command read_reg_command = {
@@ -1160,12 +1162,13 @@ static int verify_memory(const void *buf, unsigned len, unsigned addr)
int ret, mismatch = 0;
void *readbuf;
unsigned offset = 0, now;
+ unsigned alen = ALIGN(len, 4);
- readbuf = malloc(len);
+ readbuf = malloc(alen);
if (!readbuf)
return -ENOMEM;
- ret = read_memory(addr, readbuf, len);
+ ret = read_memory(addr, readbuf, alen);
if (ret < 0)
goto err;
--
2.17.0
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
