[PATCH v2 2/3] mkimage: fit: handle FDT_ERR_NOSPACE when ciphering

Philippe REYNES philippe.reynes at softathome.com
Thu Jul 30 15:53:11 CEST 2020


Hi Patrick,

> From: Patrick Oppenlander <patrick.oppenlander at gmail.com>
> 
> Also replace fdt_delprop/fdt_setprop with fdt_setprop as fdt_setprop can
> replace an existing property value.

Reviewed-by: Philippe Reynes <philippe.reynes at softathome.com>
 
> Signed-off-by: Patrick Oppenlander <patrick.oppenlander at gmail.com>


Regards,
Philippe


> ---
> tools/image-host.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/tools/image-host.c b/tools/image-host.c
> index dd7ecc4b60..b4603c5f01 100644
> --- a/tools/image-host.c
> +++ b/tools/image-host.c
> @@ -399,23 +399,24 @@ int fit_image_write_cipher(void *fit, int image_noffset,
> int noffset,
> {
> int ret = -1;
> 
> - /* Remove unciphered data */
> - ret = fdt_delprop(fit, image_noffset, FIT_DATA_PROP);
> - if (ret) {
> - printf("Can't remove data (err = %d)\n", ret);
> - goto out;
> - }
> -
> - /* Add ciphered data */
> + /* Replace data with ciphered data */
> ret = fdt_setprop(fit, image_noffset, FIT_DATA_PROP,
> data_ciphered, data_ciphered_len);
> + if (ret == -FDT_ERR_NOSPACE) {
> + ret = -ENOSPC;
> + goto out;
> + }
> if (ret) {
> - printf("Can't add ciphered data (err = %d)\n", ret);
> + printf("Can't replace data with ciphered data (err = %d)\n", ret);
> goto out;
> }
> 
> /* add non ciphered data size */
> ret = fdt_setprop_u32(fit, image_noffset, "data-size-unciphered", size);
> + if (ret == -FDT_ERR_NOSPACE) {
> + ret = -ENOSPC;
> + goto out;
> + }
> if (ret) {
> printf("Can't add unciphered data size (err = %d)\n", ret);
> goto out;
> --
> 2.27.0


More information about the U-Boot mailing list