Skip to content

Commit

Permalink
usb: gadget: fastboot: fix barebox update without using buffer
Browse files Browse the repository at this point in the history
Commit e509849 "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 <[email protected]>
Signed-off-by: Sascha Hauer <[email protected]>
  • Loading branch information
mgrzeschik authored and saschahauer committed May 17, 2018
1 parent a90a0bb commit 03f2a17
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/gadget/f_fastboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 03f2a17

Please sign in to comment.