From: Ross Lagerwall <ross.lagerwall@citrix.com> To: grub-devel@gnu.org Cc: xen-devel@lists.xenproject.org, Andrew Cooper <andrew.cooper3@citrix.com>, Daniel Kiper <daniel.kiper@oracle.com>, Ross Lagerwall <ross.lagerwall@citrix.com> Subject: [PATCH 3/7] multiboot2: Add support for the load type header tag Date: Wed, 13 Mar 2024 15:07:44 +0000 [thread overview] Message-ID: <20240313150748.791236-4-ross.lagerwall@citrix.com> (raw) In-Reply-To: <20240313150748.791236-1-ross.lagerwall@citrix.com> The binary may expose its type using the load type header tag. Implement it according to the specification. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> --- grub-core/loader/multiboot_mbi2.c | 45 ++++++++++++++++++++++++++++--- include/grub/multiboot2.h | 1 + include/multiboot2.h | 13 +++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c index 00a48413c013..6ef4f265070a 100644 --- a/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c @@ -119,10 +119,12 @@ grub_multiboot2_load (grub_file_t file, const char *filename) grub_uint32_t console_required = 0; struct multiboot_header_tag_framebuffer *fbtag = NULL; int accepted_consoles = GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT; + struct multiboot_header_tag_load_type *load_type_tag; mbi_load_data_t mld; mld.mbi_ver = 2; mld.relocatable = 0; + mld.load_type = MULTIBOOT_LOAD_TYPE_TOTAL; mld.buffer = grub_malloc (MULTIBOOT_SEARCH); if (!mld.buffer) @@ -258,6 +260,17 @@ grub_multiboot2_load (grub_file_t file, const char *filename) #endif break; + case MULTIBOOT_HEADER_TAG_LOAD_TYPE: + load_type_tag = (struct multiboot_header_tag_load_type *) tag; + mld.load_type = load_type_tag->load_type; + if (mld.load_type >= MULTIBOOT_LOAD_TYPE_TOTAL) + { + grub_free (mld.buffer); + return grub_error (GRUB_ERR_UNKNOWN_OS, + "unsupported load type: %u", load_type_tag->load_type); + } + break; + default: if (! (tag->flags & MULTIBOOT_HEADER_TAG_OPTIONAL)) { @@ -268,14 +281,32 @@ grub_multiboot2_load (grub_file_t file, const char *filename) break; } - if (addr_tag && !entry_specified && !(keep_bs && efi_entry_specified)) + if (mld.load_type == MULTIBOOT_LOAD_TYPE_ADDRESS && !addr_tag) + { + grub_free (mld.buffer); + return grub_error (GRUB_ERR_UNKNOWN_OS, + "load type address without address tag"); + } + if (mld.load_type < MULTIBOOT_LOAD_TYPE_TOTAL && + mld.load_type != MULTIBOOT_LOAD_TYPE_ADDRESS && addr_tag) + { + grub_free (mld.buffer); + return grub_error (GRUB_ERR_UNKNOWN_OS, + "address tag specified but load type doesn't match"); + } + if (mld.load_type == MULTIBOOT_LOAD_TYPE_TOTAL) + mld.load_type = addr_tag ? MULTIBOOT_LOAD_TYPE_ADDRESS : MULTIBOOT_LOAD_TYPE_ELF; + + if (mld.load_type == MULTIBOOT_LOAD_TYPE_ADDRESS && !entry_specified && + !(keep_bs && efi_entry_specified)) { grub_free (mld.buffer); return grub_error (GRUB_ERR_UNKNOWN_OS, "load address tag without entry address tag"); } - if (addr_tag) + switch (mld.load_type) { + case MULTIBOOT_LOAD_TYPE_ADDRESS: { grub_uint64_t load_addr = (addr_tag->load_addr + 1) ? addr_tag->load_addr : (addr_tag->header_addr @@ -343,8 +374,9 @@ grub_multiboot2_load (grub_file_t file, const char *filename) if (addr_tag->bss_end_addr) grub_memset ((grub_uint8_t *) source + load_size, 0, addr_tag->bss_end_addr - load_addr - load_size); + break; } - else + case MULTIBOOT_LOAD_TYPE_ELF: { mld.file = file; mld.filename = filename; @@ -355,7 +387,14 @@ grub_multiboot2_load (grub_file_t file, const char *filename) grub_free (mld.buffer); return err; } + break; } + case MULTIBOOT_LOAD_TYPE_PE: + grub_fatal ("Unsupported load type: %u\n", mld.load_type); + default: + /* should be impossible */ + grub_fatal ("Unknown load type: %u\n", mld.load_type); + } load_base_addr = mld.load_base_addr; diff --git a/include/grub/multiboot2.h b/include/grub/multiboot2.h index b90aa6989674..1f6d4fc9e336 100644 --- a/include/grub/multiboot2.h +++ b/include/grub/multiboot2.h @@ -89,6 +89,7 @@ struct mbi_load_data grub_uint32_t link_base_addr; grub_uint32_t load_base_addr; int avoid_efi_boot_services; + grub_uint32_t load_type; }; typedef struct mbi_load_data mbi_load_data_t; diff --git a/include/multiboot2.h b/include/multiboot2.h index a039aa0439aa..f4377bf7b394 100644 --- a/include/multiboot2.h +++ b/include/multiboot2.h @@ -74,6 +74,7 @@ #define MULTIBOOT_HEADER_TAG_EFI_BS 7 #define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9 #define MULTIBOOT_HEADER_TAG_RELOCATABLE 10 +#define MULTIBOOT_HEADER_TAG_LOAD_TYPE 11 #define MULTIBOOT2_ARCHITECTURE_I386 0 #define MULTIBOOT2_ARCHITECTURE_MIPS32 4 @@ -178,6 +179,18 @@ struct multiboot_header_tag_relocatable multiboot_uint32_t preference; }; +struct multiboot_header_tag_load_type +{ + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; +#define MULTIBOOT_LOAD_TYPE_ADDRESS 0 +#define MULTIBOOT_LOAD_TYPE_ELF 1 +#define MULTIBOOT_LOAD_TYPE_PE 2 +#define MULTIBOOT_LOAD_TYPE_TOTAL 3 + multiboot_uint32_t load_type; +}; + struct multiboot_color { multiboot_uint8_t red; -- 2.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Ross Lagerwall via Grub-devel <grub-devel@gnu.org> To: grub-devel@gnu.org Cc: Ross Lagerwall <ross.lagerwall@citrix.com>, xen-devel@lists.xenproject.org, Andrew Cooper <andrew.cooper3@citrix.com>, Daniel Kiper <daniel.kiper@oracle.com> Subject: [PATCH 3/7] multiboot2: Add support for the load type header tag Date: Wed, 13 Mar 2024 15:07:44 +0000 [thread overview] Message-ID: <20240313150748.791236-4-ross.lagerwall@citrix.com> (raw) In-Reply-To: <20240313150748.791236-1-ross.lagerwall@citrix.com> The binary may expose its type using the load type header tag. Implement it according to the specification. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> --- grub-core/loader/multiboot_mbi2.c | 45 ++++++++++++++++++++++++++++--- include/grub/multiboot2.h | 1 + include/multiboot2.h | 13 +++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c index 00a48413c013..6ef4f265070a 100644 --- a/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c @@ -119,10 +119,12 @@ grub_multiboot2_load (grub_file_t file, const char *filename) grub_uint32_t console_required = 0; struct multiboot_header_tag_framebuffer *fbtag = NULL; int accepted_consoles = GRUB_MULTIBOOT2_CONSOLE_EGA_TEXT; + struct multiboot_header_tag_load_type *load_type_tag; mbi_load_data_t mld; mld.mbi_ver = 2; mld.relocatable = 0; + mld.load_type = MULTIBOOT_LOAD_TYPE_TOTAL; mld.buffer = grub_malloc (MULTIBOOT_SEARCH); if (!mld.buffer) @@ -258,6 +260,17 @@ grub_multiboot2_load (grub_file_t file, const char *filename) #endif break; + case MULTIBOOT_HEADER_TAG_LOAD_TYPE: + load_type_tag = (struct multiboot_header_tag_load_type *) tag; + mld.load_type = load_type_tag->load_type; + if (mld.load_type >= MULTIBOOT_LOAD_TYPE_TOTAL) + { + grub_free (mld.buffer); + return grub_error (GRUB_ERR_UNKNOWN_OS, + "unsupported load type: %u", load_type_tag->load_type); + } + break; + default: if (! (tag->flags & MULTIBOOT_HEADER_TAG_OPTIONAL)) { @@ -268,14 +281,32 @@ grub_multiboot2_load (grub_file_t file, const char *filename) break; } - if (addr_tag && !entry_specified && !(keep_bs && efi_entry_specified)) + if (mld.load_type == MULTIBOOT_LOAD_TYPE_ADDRESS && !addr_tag) + { + grub_free (mld.buffer); + return grub_error (GRUB_ERR_UNKNOWN_OS, + "load type address without address tag"); + } + if (mld.load_type < MULTIBOOT_LOAD_TYPE_TOTAL && + mld.load_type != MULTIBOOT_LOAD_TYPE_ADDRESS && addr_tag) + { + grub_free (mld.buffer); + return grub_error (GRUB_ERR_UNKNOWN_OS, + "address tag specified but load type doesn't match"); + } + if (mld.load_type == MULTIBOOT_LOAD_TYPE_TOTAL) + mld.load_type = addr_tag ? MULTIBOOT_LOAD_TYPE_ADDRESS : MULTIBOOT_LOAD_TYPE_ELF; + + if (mld.load_type == MULTIBOOT_LOAD_TYPE_ADDRESS && !entry_specified && + !(keep_bs && efi_entry_specified)) { grub_free (mld.buffer); return grub_error (GRUB_ERR_UNKNOWN_OS, "load address tag without entry address tag"); } - if (addr_tag) + switch (mld.load_type) { + case MULTIBOOT_LOAD_TYPE_ADDRESS: { grub_uint64_t load_addr = (addr_tag->load_addr + 1) ? addr_tag->load_addr : (addr_tag->header_addr @@ -343,8 +374,9 @@ grub_multiboot2_load (grub_file_t file, const char *filename) if (addr_tag->bss_end_addr) grub_memset ((grub_uint8_t *) source + load_size, 0, addr_tag->bss_end_addr - load_addr - load_size); + break; } - else + case MULTIBOOT_LOAD_TYPE_ELF: { mld.file = file; mld.filename = filename; @@ -355,7 +387,14 @@ grub_multiboot2_load (grub_file_t file, const char *filename) grub_free (mld.buffer); return err; } + break; } + case MULTIBOOT_LOAD_TYPE_PE: + grub_fatal ("Unsupported load type: %u\n", mld.load_type); + default: + /* should be impossible */ + grub_fatal ("Unknown load type: %u\n", mld.load_type); + } load_base_addr = mld.load_base_addr; diff --git a/include/grub/multiboot2.h b/include/grub/multiboot2.h index b90aa6989674..1f6d4fc9e336 100644 --- a/include/grub/multiboot2.h +++ b/include/grub/multiboot2.h @@ -89,6 +89,7 @@ struct mbi_load_data grub_uint32_t link_base_addr; grub_uint32_t load_base_addr; int avoid_efi_boot_services; + grub_uint32_t load_type; }; typedef struct mbi_load_data mbi_load_data_t; diff --git a/include/multiboot2.h b/include/multiboot2.h index a039aa0439aa..f4377bf7b394 100644 --- a/include/multiboot2.h +++ b/include/multiboot2.h @@ -74,6 +74,7 @@ #define MULTIBOOT_HEADER_TAG_EFI_BS 7 #define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9 #define MULTIBOOT_HEADER_TAG_RELOCATABLE 10 +#define MULTIBOOT_HEADER_TAG_LOAD_TYPE 11 #define MULTIBOOT2_ARCHITECTURE_I386 0 #define MULTIBOOT2_ARCHITECTURE_MIPS32 4 @@ -178,6 +179,18 @@ struct multiboot_header_tag_relocatable multiboot_uint32_t preference; }; +struct multiboot_header_tag_load_type +{ + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; +#define MULTIBOOT_LOAD_TYPE_ADDRESS 0 +#define MULTIBOOT_LOAD_TYPE_ELF 1 +#define MULTIBOOT_LOAD_TYPE_PE 2 +#define MULTIBOOT_LOAD_TYPE_TOTAL 3 + multiboot_uint32_t load_type; +}; + struct multiboot_color { multiboot_uint8_t red; -- 2.43.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
next prev parent reply other threads:[~2024-03-13 15:06 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-13 15:07 [PATCH 0/7] GRUB: Supporting Secure Boot of xen.gz Ross Lagerwall 2024-03-13 15:07 ` Ross Lagerwall via Grub-devel 2024-03-13 15:07 ` [PATCH 1/7] multiboot2: Add load type header and support for the PE binary type Ross Lagerwall 2024-03-13 15:07 ` Ross Lagerwall via Grub-devel 2024-03-14 7:24 ` Jan Beulich 2024-03-14 7:24 ` Jan Beulich via Grub-devel 2024-03-14 8:12 ` Damien Zammit via Grub-devel 2024-03-14 8:12 ` Damien Zammit 2024-03-14 8:49 ` Vladimir 'phcoder' Serbinenko 2024-03-14 9:30 ` Ross Lagerwall 2024-03-14 9:30 ` Ross Lagerwall via Grub-devel 2024-03-14 13:37 ` Jan Beulich 2024-03-14 13:37 ` Jan Beulich via Grub-devel 2024-03-14 14:24 ` Ross Lagerwall 2024-03-14 14:24 ` Ross Lagerwall via Grub-devel 2024-03-14 14:33 ` Jan Beulich 2024-03-14 14:33 ` Jan Beulich via Grub-devel 2024-03-19 12:12 ` Roger Pau Monné 2024-03-19 12:12 ` Roger Pau Monné via Grub-devel 2024-03-19 13:18 ` Roger Pau Monné 2024-03-19 13:18 ` Roger Pau Monné via Grub-devel 2024-03-19 14:46 ` Ross Lagerwall 2024-03-19 14:46 ` Ross Lagerwall via Grub-devel 2024-03-20 11:04 ` Roger Pau Monné 2024-03-20 11:04 ` Roger Pau Monné via Grub-devel 2024-03-13 15:07 ` [PATCH 2/7] multiboot2: Allow 64-bit entry tags Ross Lagerwall 2024-03-13 15:07 ` Ross Lagerwall via Grub-devel 2024-03-19 10:07 ` Roger Pau Monné 2024-03-19 10:07 ` Roger Pau Monné via Grub-devel 2024-03-28 15:05 ` Ross Lagerwall 2024-03-28 15:05 ` Ross Lagerwall via Grub-devel 2024-03-28 15:41 ` Roger Pau Monné 2024-03-28 15:41 ` Roger Pau Monné via Grub-devel 2024-03-13 15:07 ` Ross Lagerwall [this message] 2024-03-13 15:07 ` [PATCH 3/7] multiboot2: Add support for the load type header tag Ross Lagerwall via Grub-devel 2024-03-15 7:30 ` Vladimir 'phcoder' Serbinenko 2024-03-15 7:30 ` Vladimir 'phcoder' Serbinenko 2024-03-28 14:58 ` Ross Lagerwall 2024-03-28 14:58 ` Ross Lagerwall via Grub-devel 2024-03-13 15:07 ` [PATCH 4/7] multiboot2: Add PE load support Ross Lagerwall 2024-03-13 15:07 ` Ross Lagerwall via Grub-devel 2024-03-13 15:07 ` [PATCH 5/7] multiboot2: Add support for 64-bit entry addresses Ross Lagerwall 2024-03-13 15:07 ` Ross Lagerwall via Grub-devel 2024-03-13 15:07 ` [PATCH 6/7] efi: Allow loading multiboot modules without verification Ross Lagerwall 2024-03-13 15:07 ` Ross Lagerwall via Grub-devel 2024-03-13 15:07 ` [PATCH 7/7] verifiers: Verify after decompression Ross Lagerwall 2024-03-13 15:07 ` Ross Lagerwall via Grub-devel 2024-03-15 3:50 ` Michael Chang 2024-03-15 3:50 ` Michael Chang via Grub-devel 2024-03-15 7:25 ` Vladimir 'phcoder' Serbinenko 2024-03-28 14:55 ` Ross Lagerwall via Grub-devel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240313150748.791236-4-ross.lagerwall@citrix.com \ --to=ross.lagerwall@citrix.com \ --cc=andrew.cooper3@citrix.com \ --cc=daniel.kiper@oracle.com \ --cc=grub-devel@gnu.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.