mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Michael Grzeschik <m.grzeschik@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] usb: gadget: fastboot: fix barebox update without using buffer
Date: Thu, 17 May 2018 09:04:01 +0200	[thread overview]
Message-ID: <20180517070401.phkf2nhicz7mrb26@pengutronix.de> (raw)
In-Reply-To: <20180516164328.3254-1-m.grzeschik@pengutronix.de>

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

      reply	other threads:[~2018-05-17  7:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-16 16:43 Michael Grzeschik
2018-05-17  7:04 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180517070401.phkf2nhicz7mrb26@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=m.grzeschik@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox