| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 1 | From 24a496c861fff6f8633453eedb92079976d3058f Mon Sep 17 00:00:00 2001 |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 2 | From: Lorenz Brun <lorenz@monogon.tech> |
| 3 | Date: Thu, 29 Jun 2023 03:54:01 +0200 |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 4 | Subject: [PATCH 1/2] Implement filename-based A/B slot handling |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 5 | |
| 6 | --- |
| 7 | src/boot/efi/stub.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ |
| 8 | 1 file changed, 66 insertions(+) |
| 9 | |
| 10 | diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 11 | index 841a0e41bd..267ecbcc81 100644 |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 12 | --- a/src/boot/efi/stub.c |
| 13 | +++ b/src/boot/efi/stub.c |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 14 | @@ -6,6 +6,8 @@ |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 15 | #include "cpio.h" |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 16 | #include "devicetree.h" |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 17 | #include "disk.h" |
| 18 | +#include "efibind.h" |
| 19 | +#include "efidevp.h" |
| 20 | #include "graphics.h" |
| 21 | #include "linux.h" |
| 22 | #include "measure.h" |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 23 | @@ -15,6 +17,31 @@ |
| 24 | #include "tpm-pcr.h" |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 25 | #include "util.h" |
| 26 | |
| 27 | +// From picolibc under BSD-3-Clause (c) 2018 Arm Ltd. |
| 28 | +/* Small and efficient strstr implementation. */ |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 29 | +char16_t * strstr (const char16_t *hs, const char16_t *ne) |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 30 | +{ |
| 31 | + UINTN i; |
| 32 | + int c = ne[0]; |
| 33 | + |
| 34 | + if (c == 0) |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 35 | + return (char16_t*)hs; |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 36 | + |
| 37 | + for ( ; hs[0] != '\0'; hs++) |
| 38 | + { |
| 39 | + if (hs[0] != c) |
| 40 | + continue; |
| 41 | + for (i = 1; ne[i] != 0; i++) |
| 42 | + if (hs[i] != ne[i]) |
| 43 | + break; |
| 44 | + if (ne[i] == '\0') |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 45 | + return (char16_t*)hs; |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 46 | + } |
| 47 | + |
| 48 | + return NULL; |
| 49 | +} |
| 50 | + |
| 51 | + |
| 52 | /* magic string to find in the binary image */ |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 53 | _used_ _section_(".sdmagic") static const char magic[] = "#### LoaderInfo: systemd-stub " GIT_VERSION " ####"; |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 54 | |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 55 | @@ -232,6 +259,45 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { |
| 56 | mangle_stub_cmdline(cmdline); |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 57 | } |
| 58 | |
| 59 | + /* Extract last FILEPATH element from image path to check file name */ |
| 60 | + CHAR16 *last_file_path = NULL; |
| 61 | + EFI_DEVICE_PATH *current_path_elem = loaded_image->FilePath; |
| 62 | + while (current_path_elem != NULL && !IsDevicePathEnd(current_path_elem)) { |
| 63 | + if (DevicePathType(current_path_elem) == MEDIA_DEVICE_PATH && |
| 64 | + current_path_elem->SubType == MEDIA_FILEPATH_DP) { |
| 65 | + last_file_path = ((FILEPATH_DEVICE_PATH*)current_path_elem)->PathName; |
| 66 | + } |
| 67 | + current_path_elem = NextDevicePathNode(current_path_elem); |
| 68 | + } |
| 69 | + /* Check slot based on suffix of the last FILE_PATH value */ |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 70 | + char16_t slot = 'A'; |
| 71 | + const char16_t suffix_a[] = u"boot-a.efi"; |
| 72 | + const char16_t suffix_b[] = u"boot-b.efi"; |
| 73 | + const UINTN suffix_len = (sizeof(suffix_a)/sizeof(char16_t))-1; |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 74 | + if (last_file_path != NULL) { |
| 75 | + UINTN plen = StrLen(last_file_path); |
| 76 | + if (suffix_len > plen) { |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 77 | + Print(L"File name too short, blindly booting slot A\n"); |
| 78 | + } else if (StriCmp(suffix_a, &last_file_path[plen-suffix_len]) == 0){ |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 79 | + slot = 'A'; |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 80 | + } else if (StriCmp(suffix_b, &last_file_path[plen-suffix_len]) == 0) { |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 81 | + slot = 'B'; |
| 82 | + } else { |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 83 | + Print(L"Unknown file name, blindly booting slot A\n"); |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 84 | + } |
| 85 | + } |
| 86 | + Print(L"Booting into Slot %c\n", slot); |
| 87 | + /* Replace METROPOLIS-SYSTEM-X with the correct slot */ |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 88 | + const char16_t slot_identifier[] = u"METROPOLIS-SYSTEM-X\0"; |
| 89 | + const UINTN slot_id_len = (sizeof(slot_identifier)/sizeof(char16_t))-1; |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 90 | + if (cmdline != NULL) { |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 91 | + char16_t *rest_ptr = cmdline; |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 92 | + while((rest_ptr = strstr(rest_ptr, slot_identifier))) { |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 93 | + rest_ptr[slot_id_len-2] = slot; |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 94 | + rest_ptr += slot_id_len; |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 95 | + } |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 96 | + } |
| 97 | + |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 98 | export_variables(loaded_image); |
| 99 | |
| 100 | if (pack_cpio(loaded_image, |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 101 | -- |
| Lorenz Brun | 6ff6b45 | 2025-05-22 14:35:09 +0200 | [diff] [blame] | 102 | 2.47.2 |
| Lorenz Brun | 35fcf03 | 2023-06-29 04:15:58 +0200 | [diff] [blame] | 103 | |