[PATCH] Bootm: remove uimage_close done later in bootm_boot
Sascha Hauer
s.hauer at pengutronix.de
Thu Dec 14 23:28:24 PST 2017
On Thu, Dec 14, 2017 at 01:40:56PM +0100, Clément Leger wrote:
> From 24e24f9998342b23cd8de4145c8098f93c60cdc7 Mon Sep 17 00:00:00 2001
> From: Clement Leger <clement.leger at kalray.eu>
> Date: Thu, 14 Dec 2017 13:29:50 +0100
> Subject: [PATCH] Bootm: fix double uimage_close
>
> When uimage crc fails, the error handling path call uimage_close in
> bootm_open_os_uimage and also in bootm_boot. This leads to crash/exception.
> Keep the main error handling path in bootm_boot and remove uimage_close from
> bootm_open_os_uimage to avoid double uimage_close.
> ---
> common/bootm.c | 1 -
> 1 file changed, 1 deletion(-)
Applied, thanks
Sascha
>
> diff --git a/common/bootm.c b/common/bootm.c
> index eebaa799f..c23898bea 100644
> --- a/common/bootm.c
> +++ b/common/bootm.c
> @@ -455,7 +455,6 @@ static int bootm_open_os_uimage(struct image_data *data)
> if (ret) {
> printf("Checking data crc failed with %s\n",
> strerror(-ret));
> - uimage_close(data->os);
> return ret;
> }
> }
> --
> 2.15.0.276.g89ea799
>
> _______________________________________________
> barebox mailing list
> barebox at 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 |
More information about the barebox
mailing list