File addon-add-missing-cleaning-entries.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File addon-add-missing-cleaning-entries.patch of Package systemd

From f6455e0b8746f76358a0bc6b25e328d4e7e6242a Mon Sep 17 00:00:00 2001
From: Itxaka <itxaka@kairos.io>
Date: Fri, 22 Mar 2024 11:44:49 +0100
Subject: [PATCH] Rebase  and add missing stuff

Signed-off-by: Itxaka <itxaka@kairos.io>
---
 src/boot/efi/addon.c  |  2 ++
 src/boot/efi/stub.c   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/boot/efi/addon.c b/src/boot/efi/addon.c
index 691862aff5..03eb26fca7 100644
--- a/src/boot/efi/addon.c
+++ b/src/boot/efi/addon.c
@@ -2,6 +2,8 @@
 
 #include "efi.h"
 #include "version.h"
+#include "pe.h"
+#include "addon-util.h"
 
 /* Magic string for recognizing our own binaries */
 DECLARE_NOALLOC_SECTION(".sdmagic", "#### LoaderInfo: systemd-addon " GIT_VERSION " ####");
diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index 5e0561b0eb..aa5256fa65 100644
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@ -425,6 +425,15 @@ static void dt_filenames_free(char16_t **dt_filenames, size_t n_dt) {
         free(dt_filenames);
 }
 
+static void items_free(char16_t **items, size_t n_items) {
+        assert(items || n_items == 0);
+
+        for (size_t i = 0; i < n_items; ++i)
+                free(items[i]);
+
+        free(items);
+}
+
 static EFI_STATUS load_addons(
                 EFI_HANDLE stub_image,
                 EFI_LOADED_IMAGE_PROTOCOL *loaded_image,
@@ -458,7 +467,7 @@ static EFI_STATUS load_addons(
 
         CLEANUP_ARRAY(dt_bases, n_dt, dt_bases_free);
         CLEANUP_ARRAY(dt_filenames, n_dt, dt_filenames_free);
-        CLEANUP_ARRAY(items, n_items, strv_free);
+        CLEANUP_ARRAY(items, n_items, items_free);
 
         err = open_volume(loaded_image->DeviceHandle, &root);
         if (err == EFI_UNSUPPORTED)
-- 
2.35.3

Places

File addon-add-missing-cleaning-entries.patch of Package systemd

Places