diff mbox series

[1/2] efi_loader: Fix flexible array member definitions

Message ID 20230406193707.2238981-1-ilias.apalodimas@linaro.org
State Accepted
Commit b10bfd0019f601e2608370ed47741da201423d55
Headers show
Series [1/2] efi_loader: Fix flexible array member definitions | expand

Commit Message

Ilias Apalodimas April 6, 2023, 7:37 p.m. UTC 
When a structure contains a flexible array member, it is not supposed to be
included in arrays or other structs.
Quoting the C spec [0]
"Such a structure (and any union containing, possibly recursively, a
member that is such a structure) shall not be a member of a structure
or an element of an array."

IOW efi_hii_keyboard_layout should not include
struct efi_key_descriptor descriptors[]; since we use it at the
declaration of struct efi_hii_keyboard_package.

[0] https://www.dii.uchile.cl/~daespino/files/Iso_C_1999_definition.pdf
chapter 6.7.2.1

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
---
 include/efi_api.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.39.2
diff mbox series

Patch

diff --git a/include/efi_api.h b/include/efi_api.h
index dc6e5ce236c9..2fd0221c1c77 100644
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -1173,7 +1173,7 @@  struct efi_hii_keyboard_layout {
 	efi_guid_t guid;
 	u32 layout_descriptor_string_offset;
 	u8 descriptor_count;
-	struct efi_key_descriptor descriptors[];
+	/* struct efi_key_descriptor descriptors[]; follows here */
 } __packed;

 struct efi_hii_keyboard_package {