diff options
| author | Tom Rini <trini@konsulko.com> | 2024-06-20 08:46:06 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-06-20 11:41:43 -0600 |
| commit | 81e2b69880566a90e909a7e2c02dff0c39a8c1e5 (patch) | |
| tree | b124a889c8b613b960b43dfb2bb2b21b58e3c970 /include | |
| parent | 643b55bff0b2c5fd28d4ed6fa2e482f76deb60f9 (diff) | |
| parent | 05b9665f095f2f70bf8de7ea6d1f5efc2ce7fb35 (diff) | |
| download | u-boot-81e2b69880566a90e909a7e2c02dff0c39a8c1e5.zip u-boot-81e2b69880566a90e909a7e2c02dff0c39a8c1e5.tar.gz u-boot-81e2b69880566a90e909a7e2c02dff0c39a8c1e5.tar.bz2 | |
Merge patch series "boot: fix crash in bootflow menu with EFI BOOTMGR support + typos"
Quentin Schulz <foss+uboot@0leil.net> says:
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/bootflow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/bootflow.h b/include/bootflow.h index 080ee85..6affc5e 100644 --- a/include/bootflow.h +++ b/include/bootflow.h @@ -63,7 +63,8 @@ enum bootflow_flags_t { * * @bm_node: Points to siblings in the same bootdev * @glob_node: Points to siblings in the global list (all bootdev) - * @dev: Bootdev device which produced this bootflow + * @dev: Bootdev device which produced this bootflow, NULL for flows created by + * BOOTMETHF_GLOBAL bootmeths * @blk: Block device which contains this bootflow, NULL if this is a network * device or sandbox 'host' device * @part: Partition number (0 for whole device) |