bootflow: Rework do_bootflow_menu() slightly
PATCH 1/1 bootflow: Rework do_bootflow_menu() slightly
When building this with clang, we get a warning such as:cmd/bootflow.c:412:27: warning: variable 'bflow' is uninitialized when used here [-Wuninitialized]
printf("Selected: %s\n", bflow->os_name ? bflow->os_name : bflow->name);
^~~~~And a suggestion to just initialize bflow to NULL. This would however would be ensuring a bad dereference. Instead, looking at the function we rework things so that when CONFIG_EXPO is not enabled (and so, no UI) we error early and would never reach this point in the code. Simplify the rest slightly as well while at this.
---
Cc: Simon Glass <[email protected]>
--- cmd/bootflow.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
cmd/bootflow.c +12 -12
@@ -387,6 +387,11 @@ static int do_bootflow_menu(struct cmd_tbl *cmdtp, int flag, int argc,bool text_mode = false;int ret; +if (!IS_ENABLED (CONFIG_EXPO )) { +printf ("Menu not supported\n" ); +return CMD_RET_FAILURE ; + } +if (argc >1 && *argv[1 ] =='-' ) text_mode =strchr (argv[1 ],'t' );
@@ -394,20 +399,15 @@ static int do_bootflow_menu(struct cmd_tbl *cmdtp, int flag, int argc,if (ret)return CMD_RET_FAILURE ; -if (IS_ENABLED (CONFIG_EXPO )) { - ret =bootflow_menu_run (std, text_mode, &bflow); -if (ret) { -if (ret == -EAGAIN ) -printf ("Nothing chosen\n" ); -else -printf ("Menu failed (err=%d)\n" , ret); + ret =bootflow_menu_run (std, text_mode, &bflow); +if (ret) { +if (ret == -EAGAIN ) +printf ("Nothing chosen\n" ); +else { +printf ("Menu failed (err=%d)\n" , ret); +return CMD_RET_FAILURE ; } - }else { -printf ("Menu not supported\n" ); - ret = -ENOSYS ; } -if (ret) -return CMD_RET_FAILURE ;printf ("Selected: %s\n" , bflow->os_name ? bflow->os_name : bflow->name); std->cur_bootflow = bflow;
Signature · 1 line
2.34.1
Quoted 12 lines · Tom Rini
When building this with clang, we get a warning such as:
cmd/bootflow.c:412:27: warning: variable 'bflow' is uninitialized when used here [-Wuninitialized]printf("Selected: %s\n", bflow->os_name ? bflow->os_name : bflow->name); ^~~~~And a suggestion to just initialize bflow to NULL. This would however would be ensuring a bad dereference. Instead, looking at the function we rework things so that when
CONFIG_EXPOis not enabled (and so, no UI) we error early and would never reach this point in the code. Simplify the rest slightly as well while at this.
Quoted 6 lines
Signed-off-by Tom Rini <[email protected]>---
Cc: Simon Glass <[email protected]>--- cmd/bootflow.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
Simon Glass
Reviewed-byQuoted 12 lines · Tom Rini
When building this with clang, we get a warning such as:
cmd/bootflow.c:412:27: warning: variable 'bflow' is uninitialized when used here [-Wuninitialized]printf("Selected: %s\n", bflow->os_name ? bflow->os_name : bflow->name); ^~~~~And a suggestion to just initialize bflow to NULL. This would however would be ensuring a bad dereference. Instead, looking at the function we rework things so that when
CONFIG_EXPOis not enabled (and so, no UI) we error early and would never reach this point in the code. Simplify the rest slightly as well while at this.
Quoted 6 lines
Signed-off-by Tom Rini <[email protected]>---
Cc: Simon Glass <[email protected]>--- cmd/bootflow.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
Applied to u-boot-dm, thanks!