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@xxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx
> 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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
