diff mbox series

[v5,1/1] efi_loader: Add guidcpy function

Message ID 20200107063424.120741-1-xypron.glpk@gmx.de
State Accepted
Commit 61e42d9465ef36857693cc3db615438241a06bf6
Headers show
Series [v5,1/1] efi_loader: Add guidcpy function | expand

Commit Message

Heinrich Schuchardt Jan. 7, 2020, 6:34 a.m. UTC 
From: Sughosh Ganu <sughosh.ganu at linaro.org>

Add guidcpy function to copy the source guid to the destination
guid. Use this function instead of memcpy for copying to the
destination guid.

Signed-off-by: Sughosh Ganu <sughosh.ganu at linaro.org>

Use void * instead of efi_guid_t * for arguments to allow copying unaligned
GUIDs. The GUIDs of configuration tables are __packed.

Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
---
v5:
	use void * as argument type
---
 include/efi_loader.h          | 5 +++++
 lib/efi_loader/efi_boottime.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

--
2.24.1
diff mbox series

Patch

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 4d401f69d7..e1c9b1fd6a 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -17,6 +17,11 @@  static inline int guidcmp(const void *g1, const void *g2)
 	return memcmp(g1, g2, sizeof(efi_guid_t));
 }

+static inline void *guidcpy(void *dst, const void *src)
+{
+	return memcpy(dst, src, sizeof(efi_guid_t));
+}
+
 /* No need for efi loader support in SPL */
 #if CONFIG_IS_ENABLED(EFI_LOADER)

diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 88a7604bbf..3103a50158 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -1401,7 +1401,7 @@  static efi_status_t EFIAPI efi_register_protocol_notify(
 	}

 	item->event = event;
-	memcpy(&item->protocol, protocol, sizeof(efi_guid_t));
+	guidcpy(&item->protocol, protocol);
 	INIT_LIST_HEAD(&item->handles);

 	list_add_tail(&item->link, &efi_register_notify_events);
@@ -1632,7 +1632,7 @@  efi_status_t efi_install_configuration_table(const efi_guid_t *guid,
 		return EFI_OUT_OF_RESOURCES;

 	/* Add a new entry */
-	memcpy(&systab.tables[i].guid, guid, sizeof(*guid));
+	guidcpy(&systab.tables[i].guid, guid);
 	systab.tables[i].table = table;
 	systab.nr_tables = i + 1;