From patchwork Fri Apr 17 22:07:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Stuebner X-Patchwork-Id: 237941 List-Id: U-Boot discussion From: heiko at sntech.de (Heiko Stuebner) Date: Sat, 18 Apr 2020 00:07:13 +0200 Subject: [PATCH 4/7] mkimage: fit_image: handle multiple errors when writing signatures In-Reply-To: <20200417220716.3670302-1-heiko@sntech.de> References: <20200417220716.3670302-1-heiko@sntech.de> Message-ID: <20200417220716.3670302-5-heiko@sntech.de> From: Heiko Stuebner fit_image_write_sig() contains mostly functions from libfdt that return FDT_ERR_foo errors but also a call to fit_set_timestamp() which returns a regular error. When handling the size increase via multiple iterations, check for both -FDT_ERR_NOSPACE but also for -ENOSPC. There is no real conflict, as FDT_ERR_NOSPACE = 3 = ESRCH (No such process) and ENOSPC = 28 which is above any FDT_ERR_*. Signed-off-by: Heiko Stuebner Reviewed-by: Simon Glass --- tools/image-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/image-host.c b/tools/image-host.c index 4e57ddea96..355ceb4591 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -240,7 +240,7 @@ static int fit_image_process_sig(const char *keydir, void *keydest, ret = fit_image_write_sig(fit, noffset, value, value_len, comment, NULL, 0, cmdname); if (ret) { - if (ret == -FDT_ERR_NOSPACE) + if (ret == -FDT_ERR_NOSPACE || ret == -ENOSPC) return -ENOSPC; printf("Can't write signature for '%s' signature node in '%s' conf node: %s\n", node_name, image_name, fdt_strerror(ret));