summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2018-05-16 18:43:28 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2018-05-17 09:03:08 +0200
commit03f2a17b10d060ba545cb8e280c1092b5bfdae29 (patch)
treef412da5c363a5475079cfe970bf7f7df5625324d
parenta90a0bbf41e2fc251d31de604e06895ef1db05fa (diff)
downloadbarebox-03f2a17b10d060ba545cb8e280c1092b5bfdae29.tar.gz
usb: gadget: fastboot: fix barebox update without using buffer
Commit e5098495 "usb: gadget: fastboot: Add option to download to a buffer" breaks the use of temporary files for fastboot barebox_update. In the patch the ".imagefile = FASTBOOT_TMPFILE" allocation gets removed, but data.imagefile is still used. This leads to an NULL pointer dereference. We fix it by using sourcefile instead. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/usb/gadget/f_fastboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
index 787b120..7ccf227 100644
--- a/drivers/usb/gadget/f_fastboot.c
+++ b/drivers/usb/gadget/f_fastboot.c
@@ -999,7 +999,7 @@ static void cb_flash(struct f_fastboot *f_fb, const char *cmd)
if (fastboot_download_to_buf(f_fb)) {
data.len = f_fb->download_size;
} else {
- ret = read_file_2(data.imagefile, &data.len, &f_fb->buf,
+ ret = read_file_2(sourcefile, &data.len, &f_fb->buf,
f_fb->download_size);
if (ret) {
fastboot_tx_print(f_fb, "FAILreading barebox");