diff options
| author | Michael Walle <[email protected]> | 2025-10-31 14:13:52 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-06 08:31:14 -0600 |
| commit | 52442205d30eec4571a466c78dee0047677be56c (patch) | |
| tree | ea523afc883541a2db43b001bdde95a6b55433b6 | |
| parent | b790f31752d7650d5f557509f17b1396f0cc1f70 (diff) | |
common/spl: fix endless loop in spl_fit_append_fdt()
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 <[email protected]>
| -rw-r--r-- | common/spl/spl_fit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 746c3d2fa28..d8cb2aa2fa3 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -448,8 +448,8 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, debug("%s: No additional FDT node\n", __func__); ret = 0; break; - } else if (ret < 0) { - continue; + } else if (ret) { + break; } ret = board_spl_fit_append_fdt_skip(str); |