From: AKASHI Takahiro <takahiro.akashi@linaro.org>
Date: Tue, 17 Mar 2020 02:12:37 +0000 (+0900)
Subject: efi_loader: correct a definition of struct efi_capsule_header
X-Git-Tag: v2025.01-rc5-pxa1908~2521^2
X-Git-Url: http://git.dujemihanovic.xyz/%7B%7B%20%24style.Permalink%20%7D%7D?a=commitdiff_plain;h=74b44875357378c83e4bd150c0b759ca6ae6563a;p=u-boot.git

efi_loader: correct a definition of struct efi_capsule_header

See UEFI specification, section 8.5.3.
In addition, the structure, efi_capsule_header, should be "packed"
as it is a serialized binary format in a capsule file.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---

diff --git a/include/efi_api.h b/include/efi_api.h
index 3b0845aafd..4713da2e1d 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -217,11 +217,11 @@ enum efi_reset_type {
 #define CAPSULE_FLAGS_INITIATE_RESET		0x00040000
 
 struct efi_capsule_header {
-	efi_guid_t *capsule_guid;
+	efi_guid_t capsule_guid;
 	u32 header_size;
 	u32 flags;
 	u32 capsule_image_size;
-};
+} __packed;
 
 #define EFI_RT_SUPPORTED_GET_TIME			0x0001
 #define EFI_RT_SUPPORTED_SET_TIME			0x0002