Skip to contentSkip to conversation

efi_loader: unload applications upon Exit()

PATCH New Heinrich Schuchardt 2 participants 5 messages May 7, 2019 – May 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 efi_loader: unload applications upon Exit()

Implement unloading of images in the Exit() boot services:

* unload images that are not yet started,
* unload started applications,
* unload drivers returning an error.

---
v2
Images that are no yet started can be unloaded by calling Exit(). In this case they are not the current image. Move the test for current down in the code.

A started driver that called Exit() should still be considered a started image. Exit cannot be called by another image afterwards, cf. UEFI SCT 2.6 (2017), 3.5.1 Exit(), 5.1.4.5.8 - 5.1.4.5.10.

---
 include/efi_loader.h              |  1 +
 lib/efi_loader/efi_boottime.c     | 36 +++++++++++++++++++++++++------
 lib/efi_loader/efi_image_loader.c |  2 ++
 3 files changed, 33 insertions(+), 6 deletions(-)
include/efi_loader.h +1 -0
index 3b50cd28ef..4e4cffa799 100644
@@ -234,6 +234,7 @@ struct efi_loaded_image_obj {
 	struct jmp_buf_data exit_jmp;
 	EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,
 				     struct efi_system_table *st);
+	u16 image_type;
 };
 
 /**
lib/efi_loader/efi_boottime.c +30 -6
index 0385883ded..1ea96dab6c 100644
@@ -13,6 +13,7 @@
 #include <linux/libfdt_env.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
+#include <pe.h>
 #include <watchdog.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -2798,7 +2799,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 	 *	 image protocol.
 	 */
 	efi_status_t ret;
-	void *info;
+	struct efi_loaded_image *loaded_image_protocol;
 	struct efi_loaded_image_obj *image_obj =
 		(struct efi_loaded_image_obj *)image_handle;
 
@@ -2806,13 +2807,33 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 		  exit_data_size, exit_data);
 
 	/* Check parameters */
-	if (image_handle != current_image)
-		goto out;
 	ret = EFI_CALL(efi_open_protocol(image_handle, &efi_guid_loaded_image,
-					 &info, NULL, NULL,
+					 (void **)&loaded_image_protocol,
+					 NULL, NULL,
 					 EFI_OPEN_PROTOCOL_GET_PROTOCOL));
-	if (ret != EFI_SUCCESS)
+	if (ret != EFI_SUCCESS) {
+		ret = EFI_INVALID_PARAMETER;
 		goto out;
+	}
+
+	/* Unloading of unstarted images */
+	switch (image_obj->header.type) {
+	case EFI_OBJECT_TYPE_STARTED_IMAGE:
+		break;
+	case EFI_OBJECT_TYPE_LOADED_IMAGE:
+		efi_delete_image(image_obj, loaded_image_protocol);
+		ret = EFI_SUCCESS;
+		goto out;
+	default:
+		/* Handle does not refer to loaded image */
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
+	/* A started image can only be unloaded it is the last one started. */
+	if (image_handle != current_image) {
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
 
 	/* Exit data is only foreseen in case of failure. */
 	if (exit_status != EFI_SUCCESS) {
@@ -2822,6 +2843,9 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 		if (ret != EFI_SUCCESS)
 			EFI_PRINT("%s: out of memory\n", __func__);
 	}
+	if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION ||
+	    exit_status != EFI_SUCCESS)
+		efi_delete_image(image_obj, loaded_image_protocol);
 
 	/* Make sure entry/exit counts for EFI world cross-overs match */
 	EFI_EXIT(exit_status);
@@ -2837,7 +2861,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 
 	panic("EFI application exited");
 out:
-	return EFI_EXIT(EFI_INVALID_PARAMETER);
+	return EFI_EXIT(ret);
 }
 
 /**
lib/efi_loader/efi_image_loader.c +2 -0
index f8092b6202..13541cfa7a 100644
@@ -273,6 +273,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
 		IMAGE_OPTIONAL_HEADER64 *opt = &nt64->OptionalHeader;
 		image_base = opt->ImageBase;
 		efi_set_code_and_data_type(loaded_image_info, opt->Subsystem);
+		handle->image_type = opt->Subsystem;
 		efi_reloc = efi_alloc(virt_size,
 				      loaded_image_info->image_code_type);
 		if (!efi_reloc) {
@@ -288,6 +289,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
 		IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader;
 		image_base = opt->ImageBase;
 		efi_set_code_and_data_type(loaded_image_info, opt->Subsystem);
+		handle->image_type = opt->Subsystem;
 		efi_reloc = efi_alloc(virt_size,
 				      loaded_image_info->image_code_type);
 		if (!efi_reloc) {

--
2.20.1

#1 lore raw

PATCH v2 1/1 efi_loader: unload applications upon Exit()

Quoted 94 lines · Heinrich Schuchardt

Implement unloading of images in the Exit() boot services:

* unload images that are not yet started,
* unload started applications,
* unload drivers returning an error.

---
v2
Images that are no yet started can be unloaded by calling Exit(). In this case they are not the current image. Move the test for current down in the code.

A started driver that called Exit() should still be considered a started image. Exit cannot be called by another image afterwards, cf. UEFI SCT 2.6 (2017), 3.5.1 Exit(), 5.1.4.5.8 - 5.1.4.5.10.

---
 include/efi_loader.h              |  1 +
 lib/efi_loader/efi_boottime.c     | 36 +++++++++++++++++++++++++------
 lib/efi_loader/efi_image_loader.c |  2 ++
 3 files changed, 33 insertions(+), 6 deletions(-)
include/efi_loader.h +1 -0
index 3b50cd28ef..4e4cffa799 100644
@@ -234,6 +234,7 @@ struct efi_loaded_image_obj {
 	struct jmp_buf_data exit_jmp;
 	EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,
 				     struct efi_system_table *st);
+	u16 image_type;
 };
 
 /**
lib/efi_loader/efi_boottime.c +26 -5
index 0385883ded..1ea96dab6c 100644
@@ -13,6 +13,7 @@
 #include <linux/libfdt_env.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
+#include <pe.h>
 #include <watchdog.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -2798,7 +2799,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 	 *	 image protocol.
 	 */
 	efi_status_t ret;
-	void *info;
+	struct efi_loaded_image *loaded_image_protocol;
 	struct efi_loaded_image_obj *image_obj =
 		(struct efi_loaded_image_obj *)image_handle;
 
@@ -2806,13 +2807,33 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 		  exit_data_size, exit_data);
 
 	/* Check parameters */
-	if (image_handle != current_image)
-		goto out;
 	ret = EFI_CALL(efi_open_protocol(image_handle, &efi_guid_loaded_image,
-					 &info, NULL, NULL,
+					 (void **)&loaded_image_protocol,
+					 NULL, NULL,
 					 EFI_OPEN_PROTOCOL_GET_PROTOCOL));
-	if (ret != EFI_SUCCESS)
+	if (ret != EFI_SUCCESS) {
+		ret = EFI_INVALID_PARAMETER;
 		goto out;
+	}
+
+	/* Unloading of unstarted images */
+	switch (image_obj->header.type) {
+	case EFI_OBJECT_TYPE_STARTED_IMAGE:
+		break;
+	case EFI_OBJECT_TYPE_LOADED_IMAGE:
+		efi_delete_image(image_obj, loaded_image_protocol);
+		ret = EFI_SUCCESS;
+		goto out;
+	default:
+		/* Handle does not refer to loaded image */
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
+	/* A started image can only be unloaded it is the last one started. */
+	if (image_handle != current_image) {
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
 
 	/* Exit data is only foreseen in case of failure. */
 	if (exit_status != EFI_SUCCESS) {

lib/efi_loader/efi_boottime.c static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, · line 2848

Quoted 6 lines
lib/efi_loader/efi_boottime.c +3 -0
@@ -2822,6 +2843,9 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 		if (ret != EFI_SUCCESS)
 			EFI_PRINT("%s: out of memory\n", __func__);
 	}
+	if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION ||
+	    exit_status != EFI_SUCCESS)
+		efi_delete_image(image_obj, loaded_image_protocol);

No change around efi_delete_image() and "goto" above?

-Takahiro Akashi

Quoted 34 lines
lib/efi_loader/efi_boottime.c +1 -1
 	/* Make sure entry/exit counts for EFI world cross-overs match */
 	EFI_EXIT(exit_status);
@@ -2837,7 +2861,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 
 	panic("EFI application exited");
 out:
-	return EFI_EXIT(EFI_INVALID_PARAMETER);
+	return EFI_EXIT(ret);
 }
 
 /**
lib/efi_loader/efi_image_loader.c +2 -1
index f8092b6202..13541cfa7a 100644
@@ -273,6 +273,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
 		IMAGE_OPTIONAL_HEADER64 *opt = &nt64->OptionalHeader;
 		image_base = opt->ImageBase;
 		efi_set_code_and_data_type(loaded_image_info, opt->Subsystem);
+		handle->image_type = opt->Subsystem;
 		efi_reloc = efi_alloc(virt_size,
 				      loaded_image_info->image_code_type);
 		if (!efi_reloc) {
@@ -288,6 +289,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, void *efi,
 		IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader;
 		image_base = opt->ImageBase;
 		efi_set_code_and_data_type(loaded_image_info, opt->Subsystem);
+		handle->image_type = opt->Subsystem;
 		efi_reloc = efi_alloc(virt_size,
 				      loaded_image_info->image_code_type);
 		if (!efi_reloc) {
--

2.20.1

#2 lore raw

PATCH v2 1/1 efi_loader: unload applications upon Exit()

Quoted 92 lines · Takahiro Akashi
Quoted 91 lines · Heinrich Schuchardt

Implement unloading of images in the Exit() boot services:

* unload images that are not yet started,
* unload started applications,
* unload drivers returning an error.

---
v2
Images that are no yet started can be unloaded by calling Exit(). In this case they are not the current image. Move the test for current down in the code.

A started driver that called Exit() should still be considered a started image. Exit cannot be called by another image afterwards, cf. UEFI SCT 2.6 (2017), 3.5.1 Exit(), 5.1.4.5.8 - 5.1.4.5.10.

---
  include/efi_loader.h              |  1 +
  lib/efi_loader/efi_boottime.c     | 36 +++++++++++++++++++++++++------
  lib/efi_loader/efi_image_loader.c |  2 ++
  3 files changed, 33 insertions(+), 6 deletions(-)
include/efi_loader.h +1 -0
index 3b50cd28ef..4e4cffa799 100644
@@ -234,6 +234,7 @@ struct efi_loaded_image_obj {
  	struct jmp_buf_data exit_jmp;
  	EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,
  				     struct efi_system_table *st);
+	u16 image_type;
  };
 
  /**
lib/efi_loader/efi_boottime.c +26 -5
index 0385883ded..1ea96dab6c 100644
@@ -13,6 +13,7 @@
  #include <linux/libfdt_env.h>
  #include <u-boot/crc.h>
  #include <bootm.h>
+#include <pe.h>
  #include <watchdog.h>
 
  DECLARE_GLOBAL_DATA_PTR;
@@ -2798,7 +2799,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
  	 *	 image protocol.
  	 */
  	efi_status_t ret;
-	void *info;
+	struct efi_loaded_image *loaded_image_protocol;
  	struct efi_loaded_image_obj *image_obj =
  		(struct efi_loaded_image_obj *)image_handle;
 
@@ -2806,13 +2807,33 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
  		  exit_data_size, exit_data);
 
  	/* Check parameters */
-	if (image_handle != current_image)
-		goto out;
  	ret = EFI_CALL(efi_open_protocol(image_handle, &efi_guid_loaded_image,
-					 &info, NULL, NULL,
+					 (void **)&loaded_image_protocol,
+					 NULL, NULL,
  					 EFI_OPEN_PROTOCOL_GET_PROTOCOL));
-	if (ret != EFI_SUCCESS)
+	if (ret != EFI_SUCCESS) {
+		ret = EFI_INVALID_PARAMETER;
  		goto out;
+	}
+
+	/* Unloading of unstarted images */
+	switch (image_obj->header.type) {
+	case EFI_OBJECT_TYPE_STARTED_IMAGE:
+		break;
+	case EFI_OBJECT_TYPE_LOADED_IMAGE:
+		efi_delete_image(image_obj, loaded_image_protocol);
+		ret = EFI_SUCCESS;
+		goto out;
+	default:
+		/* Handle does not refer to loaded image */
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
+	/* A started image can only be unloaded it is the last one started. */
+	if (image_handle != current_image) {
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
 
Quoted 12 lines

lib/efi_loader/efi_boottime.c static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, · line 2848

Quoted 9 lines
lib/efi_loader/efi_boottime.c +3 -0
  	/* Exit data is only foreseen in case of failure. */
  	if (exit_status != EFI_SUCCESS) {
@@ -2822,6 +2843,9 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
  		if (ret != EFI_SUCCESS)
  			EFI_PRINT("%s: out of memory\n", __func__);
  	}
+	if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION ||
+	    exit_status != EFI_SUCCESS)
+		efi_delete_image(image_obj, loaded_image_protocol);

No change around efi_delete_image() and "goto" above?

Do you see a bug?

A diff would help me to understand what you would like to change.

Best regards

Heinrich

#3 lore raw

PATCH v2 1/1 efi_loader: unload applications upon Exit()

Quoted 109 lines · Heinrich Schuchardt
Quoted 92 lines · Takahiro Akashi
Quoted 91 lines · Heinrich Schuchardt

Implement unloading of images in the Exit() boot services:

* unload images that are not yet started,
* unload started applications,
* unload drivers returning an error.

---
v2
Images that are no yet started can be unloaded by calling Exit(). In this case they are not the current image. Move the test for current down in the code.

A started driver that called Exit() should still be considered a started image. Exit cannot be called by another image afterwards, cf. UEFI SCT 2.6 (2017), 3.5.1 Exit(), 5.1.4.5.8 - 5.1.4.5.10.

---
 include/efi_loader.h              |  1 +
 lib/efi_loader/efi_boottime.c     | 36 +++++++++++++++++++++++++------
 lib/efi_loader/efi_image_loader.c |  2 ++
 3 files changed, 33 insertions(+), 6 deletions(-)
include/efi_loader.h +1 -0
index 3b50cd28ef..4e4cffa799 100644
@@ -234,6 +234,7 @@ struct efi_loaded_image_obj {
 	struct jmp_buf_data exit_jmp;
 	EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,
 				     struct efi_system_table *st);
+	u16 image_type;
 };
 
 /**
lib/efi_loader/efi_boottime.c +26 -5
index 0385883ded..1ea96dab6c 100644
@@ -13,6 +13,7 @@
 #include <linux/libfdt_env.h>
 #include <u-boot/crc.h>
 #include <bootm.h>
+#include <pe.h>
 #include <watchdog.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -2798,7 +2799,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 	 *	 image protocol.
 	 */
 	efi_status_t ret;
-	void *info;
+	struct efi_loaded_image *loaded_image_protocol;
 	struct efi_loaded_image_obj *image_obj =
 		(struct efi_loaded_image_obj *)image_handle;
 
@@ -2806,13 +2807,33 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 		  exit_data_size, exit_data);
 
 	/* Check parameters */
-	if (image_handle != current_image)
-		goto out;
 	ret = EFI_CALL(efi_open_protocol(image_handle, &efi_guid_loaded_image,
-					 &info, NULL, NULL,
+					 (void **)&loaded_image_protocol,
+					 NULL, NULL,
 					 EFI_OPEN_PROTOCOL_GET_PROTOCOL));
-	if (ret != EFI_SUCCESS)
+	if (ret != EFI_SUCCESS) {
+		ret = EFI_INVALID_PARAMETER;
 		goto out;
+	}
+
+	/* Unloading of unstarted images */
+	switch (image_obj->header.type) {
+	case EFI_OBJECT_TYPE_STARTED_IMAGE:
+		break;
+	case EFI_OBJECT_TYPE_LOADED_IMAGE:
+		efi_delete_image(image_obj, loaded_image_protocol);
+		ret = EFI_SUCCESS;
+		goto out;
+	default:
+		/* Handle does not refer to loaded image */
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
+	/* A started image can only be unloaded it is the last one started. */
+	if (image_handle != current_image) {
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
 
Quoted 12 lines

lib/efi_loader/efi_boottime.c static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, · line 2848

Quoted 9 lines
lib/efi_loader/efi_boottime.c +3 -0
 	/* Exit data is only foreseen in case of failure. */
 	if (exit_status != EFI_SUCCESS) {
@@ -2822,6 +2843,9 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
 		if (ret != EFI_SUCCESS)
 			EFI_PRINT("%s: out of memory\n", __func__);
 	}
+	if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION ||
+	    exit_status != EFI_SUCCESS)
+		efi_delete_image(image_obj, loaded_image_protocol);

No change around efi_delete_image() and "goto" above?

Do you see a bug?

A diff would help me to understand what you would like to change.

Quoted 8 lines · You
Quoted 3 lines

For me, your code is much unreadable.
Moreover, I remember that you have said, in a review of my patch, that we should use "goto" only in error cases.

Good point. So the check must be after handling
EFI_OBJECT_TYPE_LOADED_IMAGE.

I will revise the patch.

-Takahiro Akashi

Quoted 4 lines

Best regards

Heinrich

#4 lore raw

PATCH v2 1/1 efi_loader: unload applications upon Exit()

Quoted 75 lines · Takahiro Akashi
Quoted 74 lines · Heinrich Schuchardt
Quoted 73 lines · Takahiro Akashi
Quoted 72 lines · Heinrich Schuchardt

Implement unloading of images in the Exit() boot services:

* unload images that are not yet started,
* unload started applications,
* unload drivers returning an error.

---
v2
Images that are no yet started can be unloaded by calling Exit(). In this case they are not the current image. Move the test for current down in the code.

A started driver that called Exit() should still be considered a started image. Exit cannot be called by another image afterwards, cf. UEFI SCT 2.6 (2017), 3.5.1 Exit(), 5.1.4.5.8 - 5.1.4.5.10.

---
  include/efi_loader.h              |  1 +
  lib/efi_loader/efi_boottime.c     | 36 +++++++++++++++++++++++++------
  lib/efi_loader/efi_image_loader.c |  2 ++
  3 files changed, 33 insertions(+), 6 deletions(-)
include/efi_loader.h +1 -0
index 3b50cd28ef..4e4cffa799 100644
@@ -234,6 +234,7 @@ struct efi_loaded_image_obj {
  	struct jmp_buf_data exit_jmp;
  	EFIAPI efi_status_t (*entry)(efi_handle_t image_handle,
  				     struct efi_system_table *st);
+	u16 image_type;
  };
 
  /**
lib/efi_loader/efi_boottime.c +8 -5
index 0385883ded..1ea96dab6c 100644
@@ -13,6 +13,7 @@
  #include <linux/libfdt_env.h>
  #include <u-boot/crc.h>
  #include <bootm.h>
+#include <pe.h>
  #include <watchdog.h>
 
  DECLARE_GLOBAL_DATA_PTR;
@@ -2798,7 +2799,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
  	 *	 image protocol.
  	 */
  	efi_status_t ret;
-	void *info;
+	struct efi_loaded_image *loaded_image_protocol;
  	struct efi_loaded_image_obj *image_obj =
  		(struct efi_loaded_image_obj *)image_handle;
 
@@ -2806,13 +2807,33 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
  		  exit_data_size, exit_data);
 
  	/* Check parameters */
-	if (image_handle != current_image)
-		goto out;
  	ret = EFI_CALL(efi_open_protocol(image_handle, &efi_guid_loaded_image,
-					 &info, NULL, NULL,
+					 (void **)&loaded_image_protocol,
+					 NULL, NULL,
  					 EFI_OPEN_PROTOCOL_GET_PROTOCOL));
-	if (ret != EFI_SUCCESS)
+	if (ret != EFI_SUCCESS) {
+		ret = EFI_INVALID_PARAMETER;
  		goto out;
+	}
+
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

lib/efi_loader/efi_boottime.c static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, · line 2826

Quoted 8 lines
lib/efi_loader/efi_boottime.c +8 -0
+	/* Unloading of unstarted images */
+	switch (image_obj->header.type) {
+	case EFI_OBJECT_TYPE_STARTED_IMAGE:
+		break;
+	case EFI_OBJECT_TYPE_LOADED_IMAGE:
+		efi_delete_image(image_obj, loaded_image_protocol);
+		ret = EFI_SUCCESS;
+		goto out;

I think the goto usage here is in accordance with
https://www.kernel.org/doc/html/v4.10/process/coding-style.html#centralized-exiting-of-functions

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

lib/efi_loader/efi_boottime.c static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, · line 2836

Quoted 10 lines
lib/efi_loader/efi_boottime.c +10 -0
+	default:
+		/* Handle does not refer to loaded image */
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}
+	/* A started image can only be unloaded it is the last one started. */
+	if (image_handle != current_image) {
+		ret = EFI_INVALID_PARAMETER;
+		goto out;
+	}

These are the lines I moved down.

Regards

Heinrich

Quoted 35 lines
Quoted 17 lines
Quoted 13 lines

lib/efi_loader/efi_boottime.c static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, · line 2848

Quoted 10 lines
lib/efi_loader/efi_boottime.c +3 -0
  	/* Exit data is only foreseen in case of failure. */
  	if (exit_status != EFI_SUCCESS) {
@@ -2822,6 +2843,9 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle,
  		if (ret != EFI_SUCCESS)
  			EFI_PRINT("%s: out of memory\n", __func__);
  	}
+	if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION ||
+	    exit_status != EFI_SUCCESS)
+		efi_delete_image(image_obj, loaded_image_protocol);

No change around efi_delete_image() and "goto" above?

Do you see a bug?

A diff would help me to understand what you would like to change.

Quoted 8 lines · You
Quoted 3 lines

For me, your code is much unreadable.
Moreover, I remember that you have said, in a review of my patch, that we should use "goto" only in error cases.

Good point. So the check must be after handling
EFI_OBJECT_TYPE_LOADED_IMAGE.

I will revise the patch.

-Takahiro Akashi

Quoted 4 lines

Best regards

Heinrich