mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Clément Leger" <cleger@kalray.eu>
Cc: Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH] Bootm: remove uimage_close done later in bootm_boot
Date: Fri, 15 Dec 2017 08:28:24 +0100	[thread overview]
Message-ID: <20171215072824.k6smdqxt3xb23jwc@pengutronix.de> (raw)
In-Reply-To: <438665629.65151347.1513255256053.JavaMail.zimbra@kalray.eu>

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@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@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:[~2017-12-15  7:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-14 12:40 Clément Leger
2017-12-15  7:28 ` 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=20171215072824.k6smdqxt3xb23jwc@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=cleger@kalray.eu \
    /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