* [PATCH] usb: gadget: fastboot: fix barebox update without using buffer
@ 2018-05-16 16:43 Michael Grzeschik
2018-05-17 7:04 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Michael Grzeschik @ 2018-05-16 16:43 UTC (permalink / raw)
To: barebox
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>
---
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 787b1205ec..7ccf227714 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");
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] usb: gadget: fastboot: fix barebox update without using buffer
2018-05-16 16:43 [PATCH] usb: gadget: fastboot: fix barebox update without using buffer Michael Grzeschik
@ 2018-05-17 7:04 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2018-05-17 7:04 UTC (permalink / raw)
To: Michael Grzeschik; +Cc: barebox
On Wed, May 16, 2018 at 06:43:28PM +0200, Michael Grzeschik wrote:
> 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>
> ---
> drivers/usb/gadget/f_fastboot.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to master, thanks
Sascha
>
> diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c
> index 787b1205ec..7ccf227714 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");
> --
> 2.17.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-17 7:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-16 16:43 [PATCH] usb: gadget: fastboot: fix barebox update without using buffer Michael Grzeschik
2018-05-17 7:04 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox