From 10d16faa436c9f06bbcdeb6da35871a1b329b6b0 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 30 Jul 2022 15:52:18 -0600 Subject: [PATCH] bootstd: Detect empty bootmeth ordering 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 --- boot/bootmeth-uclass.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index c040d5f92b..b8ba4eca7a 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; -- 2.39.5