mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-12-21 01:12:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

common/spl: fix endless loop in spl_fit_append_fdt()

Browse Source 
Technically, commit 24bf44cf88e7 ("spl: fit: Do not fail immediately if
an overlay is not available") introduced that regression as the code
will never advance if spl_fit_get_image_name() will return an error. But
at that time, spl_fit_get_image_node() was used in spl_fit_append_fdt()
which calls fdt_subnode_offset() to get the image node. And I presume
the commit was about the latter failing gracefully and trying the next
one.

But with commit b13eaf3bb4e6 ("spl: fit: Add board level function to
decide application of DTO") that behavior changed and the loop in
spl_fit_append_fdt() no longer uses spl_fit_get_image_node() but
spl_fit_get_image_name() directly. Thus it doesn't make any sense to not
break the loop if that fails.

Also, the original use case of commit 24bf44cf88e7 ("spl: fit: Do not
fail immediately if an overlay is not available") is preserved because
spl_subnode_offset() is now called within the loop and errors are
handled gracefully (and advancing the index).

Fixes: b13eaf3bb4e6 ("spl: fit: Add board level function to decide application of DTO")
Signed-off-by: Michael Walle <mwalle@kernel.org>
This commit is contained in:
Michael Walle 2025-10-31 14:13:52 +01:00 committed by Tom Rini
parent b790f31752
commit 52442205d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/spl/spl_fit.c
View File

@ -448,8 +448,8 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image,
debug("%s: No additional FDT node\n", __func__); debug("%s: No additional FDT node\n", __func__);
ret = 0; ret = 0;
break; break;
} else if (ret < 0) { } else if (ret) {
continue; break;
} }
ret = board_spl_fit_append_fdt_skip(str); ret = board_spl_fit_append_fdt_skip(str);