diff options
| author | Neil Armstrong <[email protected]> | 2025-04-03 18:03:21 +0200 |
|---|---|---|
| committer | Neil Armstrong <[email protected]> | 2025-04-04 10:37:40 +0200 |
| commit | c5fd2c7ac7fa4835339ea09ead2884794314c9d8 (patch) | |
| tree | f57efb89dca1f74510c7e766356b6fd6815a076e /board/libre-computer | |
| parent | 82b69fc4224432d5aefa7ca750d950374cbc7fb2 (diff) | |
board: libre-computer: check interface before comparing it in set_dfu_alt_info()
When set_dfu_alt_info() is called, interface can be NULL when called for
the EFI capsule, so check it before calling it with strcmp().
Fixes: 12ea40d29dc ("ARM: meson: add support for Libre Computer aml-s905d3-cc")
Fixes: 9e6e6b034b1 ("ARM: meson: add support for Libre Computer aml-a311d-cc")
Fixes: 75c87c6cbc0 ("board: libre-computer: aml-s805x-cc: Enable capsule updates")
Reviewed-by: Ilias Apalodimas <[email protected]>
Link: https://lore.kernel.org/r/20250403-u-boot-fix-set-dfu-alt-info-interface-v1-1-1fdd12463186@linaro.org
Signed-off-by: Neil Armstrong <[email protected]>
Diffstat (limited to 'board/libre-computer')
| -rw-r--r-- | board/libre-computer/aml-a311d-cc/aml-a311d-cc.c | 2 | ||||
| -rw-r--r-- | board/libre-computer/aml-s805x-ac/aml-s805x-ac.c | 2 | ||||
| -rw-r--r-- | board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c index e45cfd5d8a3..294f78858a7 100644 --- a/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c +++ b/board/libre-computer/aml-a311d-cc/aml-a311d-cc.c @@ -29,7 +29,7 @@ struct efi_capsule_update_info update_info = { #if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) void set_dfu_alt_info(char *interface, char *devstr) { - if (strcmp(interface, "ram") == 0) + if (interface && strcmp(interface, "ram") == 0) env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) env_set("dfu_alt_info", update_info.dfu_string); diff --git a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c index 94cf5b4361f..1ec9a5b401e 100644 --- a/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c +++ b/board/libre-computer/aml-s805x-ac/aml-s805x-ac.c @@ -36,7 +36,7 @@ struct efi_capsule_update_info update_info = { #if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) void set_dfu_alt_info(char *interface, char *devstr) { - if (strcmp(interface, "ram") == 0) + if (interface && strcmp(interface, "ram") == 0) env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) env_set("dfu_alt_info", update_info.dfu_string); diff --git a/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c index f641db5a494..b552035ee03 100644 --- a/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c +++ b/board/libre-computer/aml-s905d3-cc/aml-s905d3-cc.c @@ -29,7 +29,7 @@ struct efi_capsule_update_info update_info = { #if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO) void set_dfu_alt_info(char *interface, char *devstr) { - if (strcmp(interface, "ram") == 0) + if (interface && strcmp(interface, "ram") == 0) env_set("dfu_alt_info", "fitimage ram 0x08080000 0x4000000"); else if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) env_set("dfu_alt_info", update_info.dfu_string); |