boot: introduce _cleanup_file_close_

diff --git a/src/boot/boot.c b/src/boot/boot.c
index 4ef519d404062ec6ecdd2807d3792e9c3962c673..f785a6daf41be1e9356d3bd2c3b28bca14168ec0 100644 (file)
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -1374,7 +1374,7 @@ static void boot_entry_parse_tries(
 
 static EFI_STATUS boot_entry_bump_counters(BootEntry *entry) {
         _cleanup_free_ char16_t* old_path = NULL, *new_path = NULL;
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         _cleanup_free_ EFI_FILE_INFO *file_info = NULL;
         size_t file_info_size;
         EFI_STATUS err;
@@ -1387,7 +1387,7 @@ static EFI_STATUS boot_entry_bump_counters(BootEntry *entry) {
         if (!entry->path || !entry->current_name || !entry->next_name)
                 return EFI_SUCCESS;
 
-        _cleanup_(file_closep) EFI_FILE *root = NULL;
+        _cleanup_file_close_ EFI_FILE *root = NULL;
         err = open_volume(entry->device, &root);
         if (err != EFI_SUCCESS)
                 return log_error_status(err, "Error opening entry root path: %m");
@@ -1525,7 +1525,7 @@ static void boot_entry_add_type1(
                 return;
 
         /* check existence */
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         err = root_dir->Open(root_dir, &handle, entry->loader, EFI_FILE_MODE_READ, 0ULL);
         if (err != EFI_SUCCESS)
                 return;
@@ -1652,7 +1652,7 @@ static void config_load_type1_entries(
                 EFI_FILE *root_dir,
                 const char16_t *loaded_image_path) {
 
-        _cleanup_(file_closep) EFI_FILE *entries_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *entries_dir = NULL;
         _cleanup_free_ EFI_FILE_INFO *f = NULL;
         size_t f_size = 0;
         EFI_STATUS err;
@@ -1907,7 +1907,7 @@ static bool is_sd_boot(EFI_FILE *root_dir, const char16_t *loader_path) {
         assert(root_dir);
         assert(loader_path);
 
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         err = root_dir->Open(root_dir, &handle, (char16_t *) loader_path, EFI_FILE_MODE_READ, 0ULL);
         if (err != EFI_SUCCESS)
                 return false;
@@ -1970,7 +1970,7 @@ static BootEntry* config_add_entry_loader_auto(
         }
 
         /* check existence */
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         EFI_STATUS err = root_dir->Open(root_dir, &handle, (char16_t *) loader, EFI_FILE_MODE_READ, 0ULL);
         if (err != EFI_SUCCESS)
                 return NULL;
@@ -2007,7 +2007,7 @@ static void config_add_entry_osx(Config *config) {
                 return;
 
         for (size_t i = 0; i < n_handles; i++) {
-                _cleanup_(file_closep) EFI_FILE *root = NULL;
+                _cleanup_file_close_ EFI_FILE *root = NULL;
 
                 if (open_volume(handles[i], &root) != EFI_SUCCESS)
                         continue;
@@ -2164,7 +2164,7 @@ static void boot_entry_add_type2(
         assert(path);
         assert(filename);
 
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         err = dir->Open(dir, &handle, (char16_t *) filename, EFI_FILE_MODE_READ, 0ULL);
         if (err != EFI_SUCCESS)
                 return;
@@ -2364,7 +2364,7 @@ static void config_load_type2_entries(
                 EFI_HANDLE *device,
                 EFI_FILE *root_dir) {
 
-        _cleanup_(file_closep) EFI_FILE *linux_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *linux_dir = NULL;
         _cleanup_free_ EFI_FILE_INFO *f = NULL;
         size_t f_size = 0;
         EFI_STATUS err;
@@ -2403,7 +2403,7 @@ static void config_load_xbootldr(
                 Config *config,
                 EFI_HANDLE *device) {
 
-        _cleanup_(file_closep) EFI_FILE *root_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *root_dir = NULL;
         EFI_HANDLE new_device = NULL;  /* avoid false maybe-uninitialized warning */
         EFI_STATUS err;
 
@@ -2455,7 +2455,7 @@ static EFI_STATUS initrd_prepare(
                 else
                         options = xasprintf("initrd=%ls", *i);
 
-                _cleanup_(file_closep) EFI_FILE *handle = NULL;
+                _cleanup_file_close_ EFI_FILE *handle = NULL;
                 err = root->Open(root, &handle, *i, EFI_FILE_MODE_READ, 0);
                 if (err != EFI_SUCCESS)
                         return err;
@@ -2476,7 +2476,7 @@ static EFI_STATUS initrd_prepare(
         uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
 
         STRV_FOREACH(i, entry->initrd) {
-                _cleanup_(file_closep) EFI_FILE *handle = NULL;
+                _cleanup_file_close_ EFI_FILE *handle = NULL;
                 err = root->Open(root, &handle, *i, EFI_FILE_MODE_READ, 0);
                 if (err != EFI_SUCCESS)
                         return err;
@@ -2539,7 +2539,7 @@ static EFI_STATUS image_start(
         if (entry->call)
                 (void) entry->call();
 
-        _cleanup_(file_closep) EFI_FILE *image_root = NULL;
+        _cleanup_file_close_ EFI_FILE *image_root = NULL;
         err = open_volume(entry->device, &image_root);
         if (err != EFI_SUCCESS)
                 return log_error_status(err, "Error opening root path: %m");
@@ -2697,7 +2697,7 @@ static void save_selected_entry(const Config *config, const BootEntry *entry) {
 
 static EFI_STATUS secure_boot_discover_keys(Config *config, EFI_FILE *root_dir) {
         EFI_STATUS err;
-        _cleanup_(file_closep) EFI_FILE *keys_basedir = NULL;
+        _cleanup_file_close_ EFI_FILE *keys_basedir = NULL;
 
         if (!IN_SET(secure_boot_mode(), SECURE_BOOT_SETUP, SECURE_BOOT_AUDIT))
                 return EFI_SUCCESS;
@@ -2869,7 +2869,7 @@ static EFI_STATUS discover_root_dir(EFI_LOADED_IMAGE_PROTOCOL *loaded_image, EFI
 
 static EFI_STATUS run(EFI_HANDLE image) {
         EFI_LOADED_IMAGE_PROTOCOL *loaded_image;
-        _cleanup_(file_closep) EFI_FILE *root_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *root_dir = NULL;
         _cleanup_(config_free) Config config = {};
         EFI_STATUS err;
         uint64_t init_usec;

diff --git a/src/boot/cpio.c b/src/boot/cpio.c
index ba439740f7bf6600659e0a701ecea97276013855..6cbecc53aa25b6477267c30127a08f20499b60d5 100644 (file)
--- a/src/boot/cpio.c
+++ b/src/boot/cpio.c
@@ -314,7 +314,7 @@ EFI_STATUS pack_cpio(
                 struct iovec *ret_buffer,
                 bool *ret_measured) {
 
-        _cleanup_(file_closep) EFI_FILE *root = NULL, *extra_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *root = NULL, *extra_dir = NULL;
         size_t dirent_size = 0, buffer_size = 0, n_items = 0, n_allocated = 0;
         _cleanup_free_ char16_t *rel_dropin_dir = NULL;
         _cleanup_free_ EFI_FILE_INFO *dirent = NULL;

diff --git a/src/boot/devicetree.c b/src/boot/devicetree.c
index 2ec5ca28dd8b20af87ba09686066842ef47d2670..85fc07c49f38b659bd69a796bc5ea933d7fbb940 100644 (file)
--- a/src/boot/devicetree.c
+++ b/src/boot/devicetree.c
@@ -63,7 +63,7 @@ static EFI_STATUS devicetree_fixup(struct devicetree_state *state, size_t len) {
 }
 
 EFI_STATUS devicetree_install(struct devicetree_state *state, EFI_FILE *root_dir, char16_t *name) {
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         _cleanup_free_ EFI_FILE_INFO *info = NULL;
         size_t len;
         EFI_STATUS err;

diff --git a/src/boot/drivers.c b/src/boot/drivers.c
index 067455771f6ad4eff37bf729496330ab1ae42610..078c6cb993a23394eb72d16ed316905cd70635f9 100644 (file)
--- a/src/boot/drivers.c
+++ b/src/boot/drivers.c
@@ -73,7 +73,7 @@ EFI_STATUS load_drivers(
                 EFI_LOADED_IMAGE_PROTOCOL *loaded_image,
                 EFI_FILE *root_dir) {
 
-        _cleanup_(file_closep) EFI_FILE *drivers_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *drivers_dir = NULL;
         _cleanup_free_ EFI_FILE_INFO *dirent = NULL;
         size_t dirent_size = 0, n_succeeded = 0;
         EFI_STATUS err;

diff --git a/src/boot/random-seed.c b/src/boot/random-seed.c
index 920f55eefc8f1a8c08393a3267472b7ba51ad38b..bf343e64d4b047c6aac52142fa0970bc2436473c 100644 (file)
--- a/src/boot/random-seed.c
+++ b/src/boot/random-seed.c
@@ -121,7 +121,7 @@ EFI_STATUS process_random_seed(EFI_FILE *root_dir) {
         _cleanup_free_ struct linux_efi_random_seed *new_seed_table = NULL;
         struct linux_efi_random_seed *previous_seed_table = NULL;
         _cleanup_free_ void *seed = NULL, *system_token = NULL;
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         _cleanup_free_ EFI_FILE_INFO *info = NULL;
         struct sha256_ctx hash;
         uint64_t uefi_monotonic_counter = 0;

diff --git a/src/boot/secure-boot.c b/src/boot/secure-boot.c
index dc61457512466d4946da3b54f742f4e34cb171fe..fc8b96ef44af5b09c2d38d5626508940e89276b1 100644 (file)
--- a/src/boot/secure-boot.c
+++ b/src/boot/secure-boot.c
@@ -115,7 +115,7 @@ EFI_STATUS secure_boot_enroll_at(EFI_FILE *root_dir, const char16_t *path, bool
                 printf("\n");
         }
 
-        _cleanup_(file_closep) EFI_FILE *dir = NULL;
+        _cleanup_file_close_ EFI_FILE *dir = NULL;
 
         err = open_directory(root_dir, path, &dir);
         if (err != EFI_SUCCESS)

diff --git a/src/boot/shim.c b/src/boot/shim.c
index 5928553471138c334ab1e46789a0148bcbcf1f57..514a1d0eda363c22cc23d100326c42b958b633f0 100644 (file)
--- a/src/boot/shim.c
+++ b/src/boot/shim.c
@@ -56,7 +56,7 @@ static bool shim_validate(
                 if (err != EFI_SUCCESS)
                         return false;
 
-                _cleanup_(file_closep) EFI_FILE *root = NULL;
+                _cleanup_file_close_ EFI_FILE *root = NULL;
                 err = open_volume(device_handle, &root);
                 if (err != EFI_SUCCESS)
                         return false;

diff --git a/src/boot/stub.c b/src/boot/stub.c
index cf990df2e732ff64f11e36f688151e45746b640f..e1ccb34a0b8fd47d689b50f627a65b9258bdc360 100644 (file)
--- a/src/boot/stub.c
+++ b/src/boot/stub.c
@@ -294,7 +294,7 @@ static EFI_STATUS load_addons_from_dir(
                 size_t *n_items,
                 size_t *n_allocated) {
 
-        _cleanup_(file_closep) EFI_FILE *extra_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *extra_dir = NULL;
         _cleanup_free_ EFI_FILE_INFO *dirent = NULL;
         size_t dirent_size = 0;
         EFI_STATUS err;
@@ -548,7 +548,7 @@ static EFI_STATUS load_addons(
                 size_t *n_ucode_addons) {
 
         _cleanup_(strv_freep) char16_t **items = NULL;
-        _cleanup_(file_closep) EFI_FILE *root = NULL;
+        _cleanup_file_close_ EFI_FILE *root = NULL;
         size_t n_items = 0, n_allocated = 0;
         EFI_STATUS err;
 
@@ -718,7 +718,7 @@ static void refresh_random_seed(EFI_LOADED_IMAGE_PROTOCOL *loaded_image) {
         if (FLAGS_SET(loader_features, EFI_LOADER_FEATURE_RANDOM_SEED))
                 return;
 
-        _cleanup_(file_closep) EFI_FILE *esp_dir = NULL;
+        _cleanup_file_close_ EFI_FILE *esp_dir = NULL;
         err = partition_open(MAKE_GUID_PTR(ESP), loaded_image->DeviceHandle, NULL, &esp_dir);
         if (err != EFI_SUCCESS) /* Non-fatal on failure, so that we still boot without it. */
                 return;

diff --git a/src/boot/util.c b/src/boot/util.c
index f5f748bc6cf1a86436c7565a88cd05a2ab717e55..bab4b12b9778022e6c7495ed906eb0b090582cf4 100644 (file)
--- a/src/boot/util.c
+++ b/src/boot/util.c
@@ -172,7 +172,7 @@ EFI_STATUS file_read(
         assert(name);
         assert(ret);
 
-        _cleanup_(file_closep) EFI_FILE *handle = NULL;
+        _cleanup_file_close_ EFI_FILE *handle = NULL;
         err = dir->Open(dir, &handle, (char16_t*) name, EFI_FILE_MODE_READ, 0ULL);
         if (err != EFI_SUCCESS)
                 return err;
@@ -315,7 +315,7 @@ EFI_STATUS open_directory(
                 const char16_t *path,
                 EFI_FILE **ret) {
 
-        _cleanup_(file_closep) EFI_FILE *dir = NULL;
+        _cleanup_file_close_ EFI_FILE *dir = NULL;
         _cleanup_free_ EFI_FILE_INFO *file_info = NULL;
         EFI_STATUS err;
 

diff --git a/src/boot/util.h b/src/boot/util.h
index 90da8ad69d8d6541a0e9ccb680aca86666dcc63c..17af86d41c6cc9e2444e3ff9c8996626c3728e61 100644 (file)
--- a/src/boot/util.h
+++ b/src/boot/util.h
@@ -140,6 +140,8 @@ static inline void file_closep(EFI_FILE **handle) {
         (*handle)->Close(*handle);
 }
 
+#define _cleanup_file_close_ _cleanup_(file_closep)
+
 static inline void unload_imagep(EFI_HANDLE *image) {
         if (*image)
                 (void) BS->UnloadImage(*image);

diff --git a/src/boot/vmm.c b/src/boot/vmm.c
index fea4c446c027b59611f1ddfb139e368fbcc1e649..29dbd6ffdb63337d475d7ace25bcd3369013ae55 100644 (file)
--- a/src/boot/vmm.c
+++ b/src/boot/vmm.c
@@ -85,7 +85,7 @@ EFI_STATUS vmm_open(EFI_HANDLE *ret_vmm_dev, EFI_FILE **ret_vmm_dir) {
                 dp_err = efivar_get_raw(MAKE_GUID_PTR(VMM_BOOT_ORDER), order_str, (void**) &dp, NULL);
 
                 for (size_t i = 0; i < n_handles; i++) {
-                        _cleanup_(file_closep) EFI_FILE *root_dir = NULL, *efi_dir = NULL;
+                        _cleanup_file_close_ EFI_FILE *root_dir = NULL, *efi_dir = NULL;
                         EFI_DEVICE_PATH *fs;
 
                         err = BS->HandleProtocol(