From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 9 Oct 2024 20:26:14 +0000 (+0900)
Subject: Merge pull request #34687 from DaanDeMeyer/mkosi
X-Git-Tag: v257-rc1~276
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0295505070df09ef891dfdb32aae1756b0361bf;p=thirdparty%2Fsystemd.git

Merge pull request #34687 from DaanDeMeyer/mkosi

Various fixes
---

a0295505070df09ef891dfdb32aae1756b0361bf
diff --cc src/boot/efi/stub.c
index d3cc809efbc,7982b0f12f9..4df993c5d0b
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@@ -662,12 -662,12 +662,12 @@@ static EFI_STATUS load_addons
  
                  if (initrd_addons && PE_SECTION_VECTOR_IS_SET(sections + UNIFIED_SECTION_INITRD)) {
                          *initrd_addons = xrealloc(*initrd_addons,
 -                                        *n_initrd_addons * sizeof(NamedAddon),
 -                                        (*n_initrd_addons + 1)  * sizeof(NamedAddon));
 +                                                  *n_initrd_addons * sizeof(NamedAddon),
 +                                                  (*n_initrd_addons + 1)  * sizeof(NamedAddon));
                          (*initrd_addons)[(*n_initrd_addons)++] = (NamedAddon) {
                                  .blob = {
-                                         .iov_base = xmemdup((const uint8_t*) loaded_addon->ImageBase + sections[UNIFIED_SECTION_INITRD].memory_offset, sections[UNIFIED_SECTION_INITRD].size),
-                                         .iov_len = sections[UNIFIED_SECTION_INITRD].size,
+                                         .iov_base = xmemdup((const uint8_t*) loaded_addon->ImageBase + sections[UNIFIED_SECTION_INITRD].memory_offset, sections[UNIFIED_SECTION_INITRD].memory_size),
+                                         .iov_len = sections[UNIFIED_SECTION_INITRD].memory_size,
                                  },
                                  .filename = xstrdup16(items[i]),
                          };
@@@ -675,12 -675,12 +675,12 @@@
  
                  if (ucode_addons && PE_SECTION_VECTOR_IS_SET(sections + UNIFIED_SECTION_UCODE)) {
                          *ucode_addons = xrealloc(*ucode_addons,
 -                                        *n_ucode_addons * sizeof(NamedAddon),
 -                                        (*n_ucode_addons + 1)  * sizeof(NamedAddon));
 +                                                 *n_ucode_addons * sizeof(NamedAddon),
 +                                                 (*n_ucode_addons + 1)  * sizeof(NamedAddon));
                          (*ucode_addons)[(*n_ucode_addons)++] = (NamedAddon) {
                                  .blob = {
-                                         .iov_base = xmemdup((const uint8_t*) loaded_addon->ImageBase + sections[UNIFIED_SECTION_UCODE].memory_offset, sections[UNIFIED_SECTION_UCODE].size),
-                                         .iov_len = sections[UNIFIED_SECTION_UCODE].size,
+                                         .iov_base = xmemdup((const uint8_t*) loaded_addon->ImageBase + sections[UNIFIED_SECTION_UCODE].memory_offset, sections[UNIFIED_SECTION_UCODE].memory_size),
+                                         .iov_len = sections[UNIFIED_SECTION_UCODE].memory_size,
                                  },
                                  .filename = xstrdup16(items[i]),
                          };