mbox series

[0/4] boot: fix crash in bootflow menu with EFI BOOTMGR support + typos

Message ID 20240612-bootflow-efi-crash-v1-0-27b71b0ff08a@cherry.de
Headers show
Series boot: fix crash in bootflow menu with EFI BOOTMGR support + typos | expand

Message

Quentin Schulz June 12, 2024, 2:58 p.m. UTC
bootflow menu currently crashes U-Boot with a NULL pointer dereference
because bootflow->dev is NULL for global bootmeths (such as EFI BOOTMGR).
Therefore, let's check if the bootflow is associated with a global
bootmeth before trying to make it part of the menu.

While this makes U-Boot not crash anymore, bootflow menu doesn't work
for me (I have never had a happy path with it, but I haven't actually
tried it before today :) ) and this was basically just implemented
following Simon's suggestion sent over IRC. No clue if this is enough or
just a quick band-aid patch.

This also fixes typos in multiple places.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
Quentin Schulz (4):
      cmd: fix typo in CMD_BOOTMETH help text
      boot: fix typos in help text of Kconfig configs
      doc: bootstd: fix typos
      boot: bootflow_menu: fix crash for EFI BOOTMGR global bootmeth

 boot/Kconfig            | 22 +++++++++++-----------
 boot/bootflow_menu.c    |  7 +++++++
 cmd/Kconfig             |  2 +-
 doc/develop/bootstd.rst | 50 ++++++++++++++++++++++++-------------------------
 include/bootflow.h      |  3 ++-
 5 files changed, 46 insertions(+), 38 deletions(-)
---
base-commit: 1ebd659cf020843fd8e8ef90d85a66941cbab6ec
change-id: 20240612-bootflow-efi-crash-c52449ef643e

Best regards,

Comments

Tom Rini June 20, 2024, 7:57 p.m. UTC | #1
On Wed, 12 Jun 2024 16:58:45 +0200, Quentin Schulz wrote:

> bootflow menu currently crashes U-Boot with a NULL pointer dereference
> because bootflow->dev is NULL for global bootmeths (such as EFI BOOTMGR).
> Therefore, let's check if the bootflow is associated with a global
> bootmeth before trying to make it part of the menu.
> 
> While this makes U-Boot not crash anymore, bootflow menu doesn't work
> for me (I have never had a happy path with it, but I haven't actually
> tried it before today :) ) and this was basically just implemented
> following Simon's suggestion sent over IRC. No clue if this is enough or
> just a quick band-aid patch.
> 
> [...]

Applied to u-boot/next, thanks!