[PATCH] Bootm: remove uimage_close done later in bootm_boot

Clément Leger cleger at kalray.eu
Thu Dec 14 04:40:56 PST 2017


>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(-)

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



More information about the barebox mailing list