[PATCH v2 16/35] bootstd: Detect empty bootmeth ordering

Simon Glass sjg at chromium.org
Sat Jul 30 23:52:18 CEST 2022

If the ordering produces no entries, this is an error. Report it, so that
the caller doesn't try to continue with a NULL bootmeth.

This fixes a crash in the bootflow_iter test when running with the sandbox
'default' device tree, instead of the required 'test' one.

Signed-off-by: Simon Glass <sjg at chromium.org>

(no changes since v1)

 boot/bootmeth-uclass.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c
index c040d5f92b2..b8ba4eca7ab 100644
--- a/boot/bootmeth-uclass.c
+++ b/boot/bootmeth-uclass.c
@@ -114,6 +114,8 @@ int bootmeth_setup_iter_order(struct bootflow_iter *iter)
 		count = upto;
+	if (!count)
+		return log_msg_ret("count2", -ENOENT);
 	iter->method_order = order;
 	iter->num_methods = count;

More information about the U-Boot mailing list