diff options
| author | Simon Glass <sjg@chromium.org> | 2016-07-03 09:40:44 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-14 18:22:37 -0400 |
| commit | 1152a05ee6593bf3036337cd18edd355589ea3a8 (patch) | |
| tree | 49b12a9b92c0df2cdc2711bb41ffbba471331c9f | |
| parent | 655cc69655f058e0354d5db4179c92d2ac0081ba (diff) | |
| download | u-boot-1152a05ee6593bf3036337cd18edd355589ea3a8.tar.gz u-boot-1152a05ee6593bf3036337cd18edd355589ea3a8.tar.bz2 u-boot-1152a05ee6593bf3036337cd18edd355589ea3a8.zip | |
tools: Correct error handling in fit_image_process_hash()
We should not be returning -1 as an error code. This can mask a situation
where we run out of space adding things to the FIT. By returning the correct
error in this case (-ENOSPC) it can be handled by the higher-level code.
This may fix the error reported by Tom Van Deun here:
https://www.mail-archive.com/u-boot@lists.denx.de/msg217417.html
although I am not sure as I cannot actually repeat it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Tom Van Deun <tom.vandeun@wapice.com>
Reviewed-by: Teddy Reed <teddy.reed@gmail.com>
| -rw-r--r-- | tools/image-host.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/image-host.c b/tools/image-host.c index 7effb6cea5..3e14fdc1eb 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -38,7 +38,7 @@ static int fit_set_hash_value(void *fit, int noffset, uint8_t *value, printf("Can't set hash '%s' property for '%s' node(%s)\n", FIT_VALUE_PROP, fit_get_name(fit, noffset, NULL), fdt_strerror(ret)); - return -1; + return ret == -FDT_ERR_NOSPACE ? -ENOSPC : -EIO; } return 0; @@ -64,25 +64,27 @@ static int fit_image_process_hash(void *fit, const char *image_name, const char *node_name; int value_len; char *algo; + int ret; node_name = fit_get_name(fit, noffset, NULL); if (fit_image_hash_get_algo(fit, noffset, &algo)) { printf("Can't get hash algo property for '%s' hash node in '%s' image node\n", node_name, image_name); - return -1; + return -ENOENT; } if (calculate_hash(data, size, algo, value, &value_len)) { printf("Unsupported hash algorithm (%s) for '%s' hash node in '%s' image node\n", algo, node_name, image_name); - return -1; + return -EPROTONOSUPPORT; } - if (fit_set_hash_value(fit, noffset, value, value_len)) { + ret = fit_set_hash_value(fit, noffset, value, value_len); + if (ret) { printf("Can't set hash value for '%s' hash node in '%s' image node\n", node_name, image_name); - return -1; + return ret; } return 0; @@ -322,7 +324,7 @@ int fit_image_add_verification_data(const char *keydir, void *keydest, comment, require_keys); } if (ret) - return -1; + return ret; } return 0; |