mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jan Weitzel <j.weitzel@phytec.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ubiformat: check file size
Date: Mon, 24 Jun 2013 21:44:05 +0200	[thread overview]
Message-ID: <20130624194405.GW32299@pengutronix.de> (raw)
In-Reply-To: <1372059045-18113-1-git-send-email-j.weitzel@phytec.de>

On Mon, Jun 24, 2013 at 09:30:45AM +0200, Jan Weitzel wrote:
> If size of a flash image file is 0 ubiformat silently formats the volume.
> Check size and abort if size == 0. This may be the case if an empty or tftp
> mounted file is used.
> 
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>

Applied, thanks

Sascha

> ---
>  commands/ubiformat.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/commands/ubiformat.c b/commands/ubiformat.c
> index 121816f..5b4e572 100644
> --- a/commands/ubiformat.c
> +++ b/commands/ubiformat.c
> @@ -325,6 +325,11 @@ static int flash_image(const struct mtd_dev_info *mtd,
>  		goto out_close;
>  	}
>  
> +	if (st_size == 0) {
> +		sys_errmsg("file \"%s\" has size 0 bytes", args.image);
> +		goto out_close;
> +	}
> +
>  	verbose(args.verbose, "will write %d eraseblocks", img_ebs);
>  	divisor = img_ebs;
>  	for (eb = 0; eb < mtd->eb_cnt; eb++) {
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> 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:[~2013-06-24 19:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-24  7:30 Jan Weitzel
2013-06-24 19:44 ` 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=20130624194405.GW32299@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=j.weitzel@phytec.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