commit 9979cff76c0d72e5ce3d99213118758ec170e4da
author Heinrich Schuchardt <xypron.glpk@gmx.de> Fri Oct 15 01:31:02 2021 +0200
committer Heinrich Schuchardt <xypron.glpk@gmx.de> Thu Oct 21 03:46:04 2021 +0200
tree 9b1b9fb1eb831410422689e70d7476cfc03053c7
parent 6e01c23384b3e98b335bfaadbe67314b8405ac57

efi_loader: efi_dp_from_lo() don't copy GUID

Instead of copying a GUID and then using a pointer to the copy for calling
guidcmp(), just pass the pointer to the orginal GUID.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

cmd/efidebug.c

diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index 67ab06a..5235dbb 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -1169,7 +1169,7 @@
 	printf("  file_path: %ls\n", dp_str);
 	efi_free_pool(dp_str);
 
-	initrd_path = efi_dp_from_lo(&lo, &initrd_dp_size, lf2_initrd_guid);
+	initrd_path = efi_dp_from_lo(&lo, &initrd_dp_size, &lf2_initrd_guid);
 	if (initrd_path) {
 		dp_str = efi_dp_str(initrd_path);
 		printf("  initrd_path: %ls\n", dp_str);

include/efi_loader.h

diff --git a/include/efi_loader.h b/include/efi_loader.h
index 5cdc723..6e806f9 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -842,7 +842,8 @@
 };
 
 struct efi_device_path *efi_dp_from_lo(struct efi_load_option *lo,
-				       efi_uintn_t *size, efi_guid_t guid);
+				       efi_uintn_t *size,
+				       const efi_guid_t *guid);
 struct efi_device_path *efi_dp_concat(const struct efi_device_path *dp1,
 				      const struct efi_device_path *dp2);
 efi_status_t efi_deserialize_load_option(struct efi_load_option *lo, u8 *data,

lib/efi_loader/efi_device_path.c

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index a09090a..a588712 100644
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -1218,7 +1218,8 @@
  */
 struct
 efi_device_path *efi_dp_from_lo(struct efi_load_option *lo,
-				efi_uintn_t *size, efi_guid_t guid)
+				efi_uintn_t *size,
+				const efi_guid_t *guid)
 {
 	struct efi_device_path *fp = lo->file_path;
 	struct efi_device_path_vendor *vendor;
@@ -1233,7 +1234,7 @@
 			continue;
 
 		vendor = (struct efi_device_path_vendor *)fp;
-		if (!guidcmp(&vendor->guid, &guid))
+		if (!guidcmp(&vendor->guid, guid))
 			return efi_dp_dup(fp);
 	}
 	log_debug("VenMedia(%pUl) not found in %ls\n", &guid, lo->label);

lib/efi_loader/efi_helper.c

diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c
index d03a736..4c5b7cd 100644
--- a/lib/efi_loader/efi_helper.c
+++ b/lib/efi_loader/efi_helper.c
@@ -83,7 +83,7 @@
 	if (ret != EFI_SUCCESS)
 		goto out;
 
-	tmp = efi_dp_from_lo(&lo, &size, guid);
+	tmp = efi_dp_from_lo(&lo, &size, &guid);
 	if (!tmp)
 		goto out;