From 03f2a17b10d060ba545cb8e280c1092b5bfdae29 Mon Sep 17 00:00:00 2001 From: Michael Grzeschik Date: Wed, 16 May 2018 18:43:28 +0200 Subject: 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 Signed-off-by: Sascha Hauer --- drivers/usb/gadget/f_fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- cgit v1.1