libefiwrapper: support LoadImage() and StartImage() Boot Services

The PE/COFF loader was only available in the host section of the
project.  This patch moves this support to the libefiwrapper making
the LoadImage() and StartImage() Boot Services widely available.

Change-Id: I5f3b0925d5075578a292b83f2da4ed92d8857184
Signed-off-by: Jeremy Compostella <[email protected]>

Author: jeremy-compostella

host/Makefile

@@ -9,8 +9,6 @@ OBJS := main.o \
 	tcp4.o \
 	fileio.o \
 	gop.o \
-	image.o \
-	pe.o \
 	host_time.o \
 	terminal_conin.o
 

host/main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation
  * All rights reserved.
  *
  * Author: Jérémy Compostella <[email protected]>
@@ -54,7 +54,6 @@
 #include "tcp4.h"
 #include "fileio.h"
 #include "gop.h"
-#include "image.h"
 #include "host_time.h"
 #include "terminal_conin.h"
 
@@ -64,7 +63,6 @@ static ewdrv_t *host_drivers[] = {
 	&tcp4_drv,
 	&fileio_drv,
 	&gop_drv,
-	&image_drv,
 	&time_drv,
 	&terminal_conin_drv,
 	NULL

include/libefiwrapper/external.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation
  * All rights reserved.
  *
  * Author: Jérémy Compostella <[email protected]>
@@ -61,6 +61,9 @@ long int strtol(const char *s, char **nptr, int base);
 unsigned long long int strtoull(const char *ptr, char **endptr, int base);
 long atol(const char *nptr);
 
+/* malloc.h */
+void *memalign(size_t align, size_t size);
+
 /* string.h */
 int memcmp(const void *s1, const void *s2, size_t n);
 void *memcpy(void *dest, const void *src, size_t n);

libefiwrapper/Android.mk

@@ -22,7 +22,9 @@ LIBEFIWRAPPER_SRC_FILES := \
 	ewarg.c \
 	sdio.c \
 	ewlib.c \
-	eraseblk.c
+	eraseblk.c \
+	image.c \
+	pe.c
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libefiwrapper-$(TARGET_BUILD_VARIANT)

libefiwrapper/Makefile

@@ -25,7 +25,9 @@ OBJS := ewvar.o \
 	ewarg.o \
 	sdio.o \
 	ewlib.o \
-	eraseblk.o
+	eraseblk.o \
+	image.o \
+	pe.o
 
 $(EW_LIB): $(OBJS)
 	$(AR) rcs $@ $^

libefiwrapper/core.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation
  * All rights reserved.
  *
  * Author: Jérémy Compostella <[email protected]>
@@ -35,6 +35,7 @@
 #include "ewarg.h"
 #include "ewlog.h"
 #include "ewvar.h"
+#include "image.h"
 #include "lib.h"
 #include "rs.h"
 #include "serialio.h"
@@ -90,7 +91,8 @@ static struct component {
 	{ "console in", conin_init, conin_free },
 	{ "console out", conout_init, conout_free },
 	{ "serial", serialio_init, serialio_free },
-	{ "smbios", smbios_init, smbios_free }
+	{ "smbios", smbios_init, smbios_free },
+	{ "image", image_init, image_free }
 };
 
 EFI_STATUS set_load_options(int argc, char **argv)

host/image.c renamed to libefiwrapper/image.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation
  * All rights reserved.
  *
  * Author: Jérémy Compostella <[email protected]>
@@ -83,7 +83,9 @@ start_image(EFI_HANDLE ImageHandle,
 {
 	EFI_STATUS ret;
 	image_t *image;
+#if defined(HOST)
 	int setjmpret;
+#endif
 
 	if (ExitDataSize || ExitData)
 		return EFI_UNSUPPORTED;
@@ -92,9 +94,11 @@ start_image(EFI_HANDLE ImageHandle,
 	if (EFI_ERROR(ret))
 		return ret;
 
+#if defined(HOST)
 	setjmpret = setjmp(image->jmp);
 	if (setjmpret != 0)
 		return image->exit_status;
+#endif
 
 	return image->entry(ImageHandle, saved_st);
 }
@@ -116,8 +120,9 @@ efi_exit(EFI_HANDLE ImageHandle,
 		return ret;
 
 	image->exit_status = ExitStatus;
+#if defined(HOST)
 	longjmp(image->jmp, 1);
-
+#endif
 	return EFI_SUCCESS;
 }
 
@@ -141,7 +146,7 @@ static EFI_IMAGE_START saved_start_image;
 static EFI_EXIT saved_efi_exit;
 static EFI_IMAGE_UNLOAD saved_unload_image;
 
-static EFI_STATUS image_init(EFI_SYSTEM_TABLE *st)
+EFI_STATUS image_init(EFI_SYSTEM_TABLE *st)
 {
 	if (!st)
 		return EFI_INVALID_PARAMETER;
@@ -161,7 +166,7 @@ static EFI_STATUS image_init(EFI_SYSTEM_TABLE *st)
 	return EFI_SUCCESS;
 }
 
-static EFI_STATUS image_exit(EFI_SYSTEM_TABLE *st)
+EFI_STATUS image_free(EFI_SYSTEM_TABLE *st)
 {
 	if (!st)
 		return EFI_INVALID_PARAMETER;
@@ -173,10 +178,3 @@ static EFI_STATUS image_exit(EFI_SYSTEM_TABLE *st)
 
 	return EFI_SUCCESS;
 }
-
-ewdrv_t image_drv = {
-	.name = "image",
-	.description = "PE/COFF image",
-	.init = image_init,
-	.exit = image_exit
-};

host/image.h renamed to libefiwrapper/image.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation
  * All rights reserved.
  *
  * Author: Jérémy Compostella <[email protected]>
@@ -32,17 +32,24 @@
 #ifndef _IMAGE_H_
 #define _IMAGE_H_
 
+#if defined(HOST)
 #include <setjmp.h>
+#endif
 #include <ewdrv.h>
 
 typedef struct image {
 	EFI_LOADED_IMAGE prot;
 	void *data;
+#if defined(HOST)
 	jmp_buf jmp;
+#endif
 	EFI_IMAGE_ENTRY_POINT entry;
 	EFI_STATUS exit_status;
 } image_t;
 
 extern ewdrv_t image_drv;
 
+EFI_STATUS image_init(EFI_SYSTEM_TABLE *st);
+EFI_STATUS image_free(EFI_SYSTEM_TABLE *st);
+
 #endif	/* _IMAGE_H_ */

host/pe.c renamed to libefiwrapper/pe.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation
  * All rights reserved.
  *
  * Author: Jérémy Compostella <[email protected]>
@@ -29,12 +29,16 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <ewlog.h>
 #include <ewlib.h>
+
+#if defined(HOST)
 #include <sys/mman.h>
+#endif
 
+#include "lib.h"
 #include "pe.h"
 
 /* The following structure definitions come from:
@@ -99,7 +103,7 @@ typedef struct {
 } std_coff_t;
 
 typedef struct {
-	UINTN image_base;
+	UINT32 image_base;
 	UINT32 section_alignment;
 	UINT32 file_alignment;
 	UINT16 major_operating_system_version;
@@ -114,14 +118,16 @@ typedef struct {
 	UINT32 checksum;
 	UINT16 subsystem;
 	UINT16 dll_characteristics;
-	UINTN size_of_stack_reserve;
-	UINTN size_of_stack_commit;
-	UINTN size_of_heap_reserve;
-	UINTN size_of_heap_commit;
+	UINT32 size_of_stack_reserve;
+	UINT32 size_of_stack_commit;
+	UINT32 size_of_heap_reserve;
+	UINT32 size_of_heap_commit;
 	UINT32 loader_flags;
 	UINT32 number_of_rva_and_sizes;
 } win_t;
 
+#define BASERELOC_DIRECTORY_ENTRY 5
+
 typedef struct {
 	coff_header_t hdr;
 	struct {
@@ -165,14 +171,17 @@ void get_section_boundaries(section_header_t *section, UINT16 nb,
 	*end = 0;
 
 	for (i = 0; i < nb; i++) {
+		UINT32 size = section[i].virtual_size;
+		if (section[i].size_of_raw_data)
+			size = section[i].size_of_raw_data;
 		*start = min(*start, section[i].virtual_address);
-		*end = max(*end, section[i].virtual_address +
-			   section[i].virtual_size);
+		*end = max(*end, section[i].virtual_address + size);
 	}
 }
 
-EFI_STATUS load_sections(section_header_t *section, UINT16 nb,
-			 void *base, image_t *image)
+static EFI_STATUS load_sections(section_header_t *section, UINT16 nb,
+				void *base, image_t *image,
+				size_t alignment)
 {
 	loaded_section_t *data;
 	UINT16 i;
@@ -188,9 +197,13 @@ EFI_STATUS load_sections(section_header_t *section, UINT16 nb,
 	get_section_boundaries(section, nb, &data->start, &data->end);
 
 	data->size = data->end - data->start;
+#if defined(HOST)
 	data->addr = mmap(NULL, data->size, PROT_EXEC | PROT_READ | PROT_WRITE,
 			  MAP_ANONYMOUS | MAP_SHARED, -1, 0);
-	if (!data->addr) {
+#else
+	data->addr = memalign(alignment, data->size);
+#endif
+	if (data->addr == (void *) -1 || data->addr == NULL) {
 		ewerr("Failed to allocate sections memory");
 		free(data);
 		return EFI_OUT_OF_RESOURCES;
@@ -205,7 +218,7 @@ EFI_STATUS load_sections(section_header_t *section, UINT16 nb,
 			data->start;
 		size = section[i].virtual_size;
 
-		if (!size && section[i].size_of_raw_data)
+		if (section[i].size_of_raw_data)
 			size = section[i].size_of_raw_data;
 		memcpy(dst, src, size);
 
@@ -248,7 +261,7 @@ EFI_STATUS pe_load(void *data, UINTN size, image_t *image)
 
 	ret = load_sections((section_header_t *)(pe + 1),
 			    pe->hdr.number_of_sections,
-			    data, image);
+			    data, image, pe->opt.win.section_alignment);
 	if (EFI_ERROR(ret))
 		return ret;
 
@@ -268,7 +281,11 @@ EFI_STATUS pe_unload(image_t *image)
 		return EFI_INVALID_PARAMETER;
 
 	data = image->data;
+#if defined(HOST)
 	munmap(data->addr, data->size);
+#else
+	free(data->addr);
+#endif
 	free(data);
 	image->data = NULL;
 

host/pe.h renamed to libefiwrapper/pe.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Intel Corporation
+ * Copyright (c) 2016-2020, Intel Corporation
  * All rights reserved.
  *
  * Author: Jérémy Compostella <[email protected]>