[PATCH 0/2] fix issues in bootmenu after adding efi entries

[PATCH 0/2] fix issues in bootmenu after adding efi entries

[Masahisa Kojima]

This series fixes the issue in bootmenu after adding efi entries.

Masahisa Kojima (2):
  bootmenu: use utf-8 for menu title
  bootmenu: U-Boot console is enabled as default

 boot/Kconfig   |  9 +++++++++
 cmd/Kconfig    | 10 ----------
 cmd/bootmenu.c | 40 +++++++++++++++++++++++-----------------
 3 files changed, 32 insertions(+), 27 deletions(-)

-- 
2.17.1

[PATCH 1/2] bootmenu: use utf-8 for menu title

[Masahisa Kojima]

The commit a3d0aa87acbe ("bootmenu: update bootmenu_entry structure")
changes the bootmenu title type from char to u16(UTF16 string)
to support EFI based system. If EFI_LOADER is not enabled,
printf("%ls") is not supported, so bootmenu does not appear
correctly.

This commit changes the type of menu title from u16(UTF16) to
utf-8 string and EFI strings is conveted into utf-8.

Fixes: a3d0aa87acbe ("bootmenu: update bootmenu_entry structure")
Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
---
 cmd/bootmenu.c | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 8859eebea5..bf88c2127b 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -43,7 +43,7 @@ enum boot_type {
 struct bootmenu_entry {
 	unsigned short int num;		/* unique number 0 .. MAX_COUNT */
 	char key[3];			/* key identifier of number */
-	u16 *title;			/* title of entry */
+	char *title;			/* title of entry */
 	char *command;			/* hush command of entry */
 	enum boot_type type;		/* boot type of entry */
 	u16 bootorder;			/* order for each boot type */
@@ -76,7 +76,7 @@ static void bootmenu_print_entry(void *data)
 	if (reverse)
 		puts(ANSI_COLOR_REVERSE);
 
-	printf("%ls", entry->title);
+	printf("%s", entry->title);
 
 	if (reverse)
 		puts(ANSI_COLOR_RESET);
@@ -170,7 +170,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu,
 	struct bootmenu_entry *iter = *current;
 
 	while ((option = bootmenu_getoption(i))) {
-		u16 *buf;
+		char *buf;
 
 		sep = strchr(option, '=');
 		if (!sep) {
@@ -183,13 +183,13 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu,
 			return -ENOMEM;
 
 		len = sep-option;
-		buf = calloc(1, (len + 1) * sizeof(u16));
+		buf = calloc(1, (len + 1));
 		entry->title = buf;
 		if (!entry->title) {
 			free(entry);
 			return -ENOMEM;
 		}
-		utf8_utf16_strncpy(&buf, option, len);
+		strncpy(buf, option, len);
 
 		len = strlen(sep + 1);
 		entry->command = malloc(len + 1);
@@ -227,6 +227,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu,
 	return 1;
 }
 
+#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR))
 /**
  * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries
  *
@@ -279,13 +280,17 @@ static int prepare_uefi_bootorder_entry(struct bootmenu_data *menu,
 		}
 
 		if (lo.attributes & LOAD_OPTION_ACTIVE) {
-			entry->title = u16_strdup(lo.label);
-			if (!entry->title) {
+			char *buf;
+
+			buf = calloc(1, utf16_utf8_strlen(lo.label) + 1);
+			if (!buf) {
 				free(load_option);
 				free(entry);
 				free(bootorder);
 				return -ENOMEM;
 			}
+			entry->title = buf;
+			utf16_utf8_strncpy(&buf, lo.label, u16_strlen(lo.label));
 			entry->command = strdup("bootefi bootmgr");
 			sprintf(entry->key, "%d", i);
 			entry->num = i;
@@ -315,6 +320,7 @@ static int prepare_uefi_bootorder_entry(struct bootmenu_data *menu,
 
 	return 1;
 }
+#endif
 
 static struct bootmenu_data *bootmenu_create(int delay)
 {
@@ -341,13 +347,13 @@ static struct bootmenu_data *bootmenu_create(int delay)
 	if (ret < 0)
 		goto cleanup;
 
-	if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) {
-		if (i < MAX_COUNT - 1) {
+#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR))
+	if (i < MAX_COUNT - 1) {
 			ret = prepare_uefi_bootorder_entry(menu, &iter, &i);
 			if (ret < 0 && ret != -ENOENT)
 				goto cleanup;
-		}
 	}
+#endif
 
 	/* Add U-Boot console entry at the end */
 	if (i <= MAX_COUNT - 1) {
@@ -357,9 +363,9 @@ static struct bootmenu_data *bootmenu_create(int delay)
 
 		/* Add Quit entry if entering U-Boot console is disabled */
 		if (IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE))
-			entry->title = u16_strdup(u"U-Boot console");
+			entry->title = strdup("U-Boot console");
 		else
-			entry->title = u16_strdup(u"Quit");
+			entry->title = strdup("Quit");
 
 		if (!entry->title) {
 			free(entry);
@@ -461,7 +467,7 @@ static enum bootmenu_ret bootmenu_show(int delay)
 	int cmd_ret;
 	int init = 0;
 	void *choice = NULL;
-	u16 *title = NULL;
+	char *title = NULL;
 	char *command = NULL;
 	struct menu *menu;
 	struct bootmenu_entry *iter;
@@ -517,7 +523,7 @@ static enum bootmenu_ret bootmenu_show(int delay)
 
 	if (menu_get_choice(menu, &choice) == 1) {
 		iter = choice;
-		title = u16_strdup(iter->title);
+		title = strdup(iter->title);
 		command = strdup(iter->command);
 
 		/* last entry is U-Boot console or Quit */
@@ -561,7 +567,7 @@ cleanup:
 	}
 
 	if (title && command) {
-		debug("Starting entry '%ls'\n", title);
+		debug("Starting entry '%s'\n", title);
 		free(title);
 		if (efi_ret == EFI_SUCCESS)
 			cmd_ret = run_command(command, 0);
-- 
2.17.1

[PATCH 2/2] bootmenu: U-Boot console is enabled as default

[Masahisa Kojima]

The commit 2158b0da220c ("bootmenu: add Kconfig option
not to enter U-Boot console") disables to enter U-Boot
console from bootmenu as default, this change affects the
existing bootmenu users.

This commit reverts the default behavior, the bootmenu can
enter U-Boot console same as before.
CMD_BOOTMENU_ENTER_UBOOT_CONSOLE is renamed
BOOTMENU_DISABLE_UBOOT_CONSOLE and depends on
AUTOBOOT_MENU_SHOW.

Fixes: 2158b0da220c ("bootmenu: add Kconfig option not to enter U-Boot console")
Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
---
 boot/Kconfig   |  9 +++++++++
 cmd/Kconfig    | 10 ----------
 cmd/bootmenu.c |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/boot/Kconfig b/boot/Kconfig
index dff4d23b88..2eae3d5c6b 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1143,6 +1143,15 @@ config AUTOBOOT_MENU_SHOW
 	  environmnent variable (if enabled) and before handling the boot delay.
 	  See README.bootmenu for more details.
 
+config BOOTMENU_DISABLE_UBOOT_CONSOLE
+	bool "Disallow bootmenu to enter the U-Boot console"
+	depends on AUTOBOOT_MENU_SHOW
+	default n
+	help
+	  If this option is enabled, user can not enter
+	  the U-Boot console from bootmenu. It increases
+	  the system security.
+
 config BOOT_RETRY
 	bool "Boot retry feature"
 	help
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 69c1814d24..09193b61b9 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -357,16 +357,6 @@ config CMD_BOOTMENU
 	help
 	  Add an ANSI terminal boot menu command.
 
-config CMD_BOOTMENU_ENTER_UBOOT_CONSOLE
-	bool "Allow Bootmenu to enter the U-Boot console"
-	depends on CMD_BOOTMENU
-	default n
-	help
-	  Add an entry to enter U-Boot console in bootmenu.
-	  If this option is disabled, user can not enter
-	  the U-Boot console from bootmenu. It increases
-	  the system security.
-
 config CMD_ADTIMG
 	bool "adtimg"
 	help
diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index bf88c2127b..1002c6b20a 100644
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -362,7 +362,7 @@ static struct bootmenu_data *bootmenu_create(int delay)
 			goto cleanup;
 
 		/* Add Quit entry if entering U-Boot console is disabled */
-		if (IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE))
+		if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
 			entry->title = strdup("U-Boot console");
 		else
 			entry->title = strdup("Quit");
@@ -595,7 +595,7 @@ int menu_show(int bootdelay)
 		if (ret == BOOTMENU_RET_UPDATED)
 			continue;
 
-		if (!IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE)) {
+		if (IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) {
 			if (ret == BOOTMENU_RET_QUIT) {
 				/* default boot process */
 				if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR))
-- 
2.17.1

Re: [PATCH 0/2] fix issues in bootmenu after adding efi entries

[Pali Rohar]

On Wednesday 25 May 2022 17:18:11 Masahisa Kojima wrote:
> This series fixes the issue in bootmenu after adding efi entries.
> 
> Masahisa Kojima (2):
>   bootmenu: use utf-8 for menu title
>   bootmenu: U-Boot console is enabled as default
> 
>  boot/Kconfig   |  9 +++++++++
>  cmd/Kconfig    | 10 ----------
>  cmd/bootmenu.c | 40 +++++++++++++++++++++++-----------------
>  3 files changed, 32 insertions(+), 27 deletions(-)
> 
> -- 
> 2.17.1
> 

I have tested these two patches and bootmenu is working on n900 again!

Tested-by: Pali Rohár <pali@kernel.org>

Re: [PATCH 0/2] fix issues in bootmenu after adding efi entries

[Masahisa Kojima]

Hi Pali,

On Thu, 26 May 2022 at 05:11, Pali Rohar <pali@kernel.org> wrote:
>
> On Wednesday 25 May 2022 17:18:11 Masahisa Kojima wrote:
> > This series fixes the issue in bootmenu after adding efi entries.
> >
> > Masahisa Kojima (2):
> >   bootmenu: use utf-8 for menu title
> >   bootmenu: U-Boot console is enabled as default
> >
> >  boot/Kconfig   |  9 +++++++++
> >  cmd/Kconfig    | 10 ----------
> >  cmd/bootmenu.c | 40 +++++++++++++++++++++++-----------------
> >  3 files changed, 32 insertions(+), 27 deletions(-)
> >
> > --
> > 2.17.1
> >
>
> I have tested these two patches and bootmenu is working on n900 again!
>
> Tested-by: Pali Rohár <pali@kernel.org>

Thank you very much for your testing.

Regards,
Masahisa Kojima

Re: [PATCH 2/2] bootmenu: U-Boot console is enabled as default

[Michal Simek]

On 5/25/22 10:18, Masahisa Kojima wrote:
> [CAUTION: External Email]
> 
> The commit 2158b0da220c ("bootmenu: add Kconfig option
> not to enter U-Boot console") disables to enter U-Boot
> console from bootmenu as default, this change affects the
> existing bootmenu users.
> 
> This commit reverts the default behavior, the bootmenu can
> enter U-Boot console same as before.
> CMD_BOOTMENU_ENTER_UBOOT_CONSOLE is renamed
> BOOTMENU_DISABLE_UBOOT_CONSOLE and depends on
> AUTOBOOT_MENU_SHOW.
> 
> Fixes: 2158b0da220c ("bootmenu: add Kconfig option not to enter U-Boot console")
> Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
> ---
>   boot/Kconfig   |  9 +++++++++
>   cmd/Kconfig    | 10 ----------
>   cmd/bootmenu.c |  4 ++--
>   3 files changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/boot/Kconfig b/boot/Kconfig
> index dff4d23b88..2eae3d5c6b 100644
> --- a/boot/Kconfig
> +++ b/boot/Kconfig
> @@ -1143,6 +1143,15 @@ config AUTOBOOT_MENU_SHOW
>            environmnent variable (if enabled) and before handling the boot delay.
>            See README.bootmenu for more details.
> 
> +config BOOTMENU_DISABLE_UBOOT_CONSOLE
> +       bool "Disallow bootmenu to enter the U-Boot console"
> +       depends on AUTOBOOT_MENU_SHOW
> +       default n

Remove this line. It is default option anyway.


> +       help
> +         If this option is enabled, user can not enter
> +         the U-Boot console from bootmenu. It increases
> +         the system security.

you have 80 chars limit that's why please use it.

> +
>   config BOOT_RETRY
>          bool "Boot retry feature"
>          help
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 69c1814d24..09193b61b9 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -357,16 +357,6 @@ config CMD_BOOTMENU
>          help
>            Add an ANSI terminal boot menu command.
> 
> -config CMD_BOOTMENU_ENTER_UBOOT_CONSOLE
> -       bool "Allow Bootmenu to enter the U-Boot console"
> -       depends on CMD_BOOTMENU
> -       default n
> -       help
> -         Add an entry to enter U-Boot console in bootmenu.
> -         If this option is disabled, user can not enter
> -         the U-Boot console from bootmenu. It increases
> -         the system security.
> -
>   config CMD_ADTIMG
>          bool "adtimg"
>          help
> diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
> index bf88c2127b..1002c6b20a 100644
> --- a/cmd/bootmenu.c
> +++ b/cmd/bootmenu.c
> @@ -362,7 +362,7 @@ static struct bootmenu_data *bootmenu_create(int delay)
>                          goto cleanup;
> 
>                  /* Add Quit entry if entering U-Boot console is disabled */
> -               if (IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE))
> +               if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
>                          entry->title = strdup("U-Boot console");
>                  else
>                          entry->title = strdup("Quit");
> @@ -595,7 +595,7 @@ int menu_show(int bootdelay)
>                  if (ret == BOOTMENU_RET_UPDATED)
>                          continue;
> 
> -               if (!IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE)) {
> +               if (IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) {
>                          if (ret == BOOTMENU_RET_QUIT) {
>                                  /* default boot process */
>                                  if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR))
> --
> 2.17.1
> 

M

Re: [PATCH 2/2] bootmenu: U-Boot console is enabled as default

[Masahisa Kojima]

On Thu, 26 May 2022 at 15:23, Michal Simek <michal.simek@xilinx.com> wrote:
>
>
>
> On 5/25/22 10:18, Masahisa Kojima wrote:
> > [CAUTION: External Email]
> >
> > The commit 2158b0da220c ("bootmenu: add Kconfig option
> > not to enter U-Boot console") disables to enter U-Boot
> > console from bootmenu as default, this change affects the
> > existing bootmenu users.
> >
> > This commit reverts the default behavior, the bootmenu can
> > enter U-Boot console same as before.
> > CMD_BOOTMENU_ENTER_UBOOT_CONSOLE is renamed
> > BOOTMENU_DISABLE_UBOOT_CONSOLE and depends on
> > AUTOBOOT_MENU_SHOW.
> >
> > Fixes: 2158b0da220c ("bootmenu: add Kconfig option not to enter U-Boot console")
> > Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
> > ---
> >   boot/Kconfig   |  9 +++++++++
> >   cmd/Kconfig    | 10 ----------
> >   cmd/bootmenu.c |  4 ++--
> >   3 files changed, 11 insertions(+), 12 deletions(-)
> >
> > diff --git a/boot/Kconfig b/boot/Kconfig
> > index dff4d23b88..2eae3d5c6b 100644
> > --- a/boot/Kconfig
> > +++ b/boot/Kconfig
> > @@ -1143,6 +1143,15 @@ config AUTOBOOT_MENU_SHOW
> >            environmnent variable (if enabled) and before handling the boot delay.
> >            See README.bootmenu for more details.
> >
> > +config BOOTMENU_DISABLE_UBOOT_CONSOLE
> > +       bool "Disallow bootmenu to enter the U-Boot console"
> > +       depends on AUTOBOOT_MENU_SHOW
> > +       default n
>
> Remove this line. It is default option anyway.

OK.

>
>
> > +       help
> > +         If this option is enabled, user can not enter
> > +         the U-Boot console from bootmenu. It increases
> > +         the system security.
>
> you have 80 chars limit that's why please use it.

OK, I will use 80 chars for one line.

Thanks,
Masahisa Kojima

>
> > +
> >   config BOOT_RETRY
> >          bool "Boot retry feature"
> >          help
> > diff --git a/cmd/Kconfig b/cmd/Kconfig
> > index 69c1814d24..09193b61b9 100644
> > --- a/cmd/Kconfig
> > +++ b/cmd/Kconfig
> > @@ -357,16 +357,6 @@ config CMD_BOOTMENU
> >          help
> >            Add an ANSI terminal boot menu command.
> >
> > -config CMD_BOOTMENU_ENTER_UBOOT_CONSOLE
> > -       bool "Allow Bootmenu to enter the U-Boot console"
> > -       depends on CMD_BOOTMENU
> > -       default n
> > -       help
> > -         Add an entry to enter U-Boot console in bootmenu.
> > -         If this option is disabled, user can not enter
> > -         the U-Boot console from bootmenu. It increases
> > -         the system security.
> > -
> >   config CMD_ADTIMG
> >          bool "adtimg"
> >          help
> > diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
> > index bf88c2127b..1002c6b20a 100644
> > --- a/cmd/bootmenu.c
> > +++ b/cmd/bootmenu.c
> > @@ -362,7 +362,7 @@ static struct bootmenu_data *bootmenu_create(int delay)
> >                          goto cleanup;
> >
> >                  /* Add Quit entry if entering U-Boot console is disabled */
> > -               if (IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE))
> > +               if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
> >                          entry->title = strdup("U-Boot console");
> >                  else
> >                          entry->title = strdup("Quit");
> > @@ -595,7 +595,7 @@ int menu_show(int bootdelay)
> >                  if (ret == BOOTMENU_RET_UPDATED)
> >                          continue;
> >
> > -               if (!IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE)) {
> > +               if (IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) {
> >                          if (ret == BOOTMENU_RET_QUIT) {
> >                                  /* default boot process */
> >                                  if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR))
> > --
> > 2.17.1
> >
>
> M