Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #262 from klange/mb2-ignore-optional

Browse Source 
multiboot2: ignore unsupported tags if they are marked optional
This commit is contained in:
ミンツキ 2023-04-12 13:18:34 +02:00 committed by GitHub
commit eae24e64e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/protos/multiboot2.c
View File

@ -119,12 +119,12 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
for (struct multiboot_header_tag *tag = (struct multiboot_header_tag*)(header + 1); // header + 1 to skip the header struct. for (struct multiboot_header_tag *tag = (struct multiboot_header_tag*)(header + 1); // header + 1 to skip the header struct.
tag < (struct multiboot_header_tag *)((uintptr_t)header + header->header_length) && tag->type != MULTIBOOT_HEADER_TAG_END; tag < (struct multiboot_header_tag *)((uintptr_t)header + header->header_length) && tag->type != MULTIBOOT_HEADER_TAG_END;
tag = (struct multiboot_header_tag *)((uintptr_t)tag + ALIGN_UP(tag->size, MULTIBOOT_TAG_ALIGN))) { tag = (struct multiboot_header_tag *)((uintptr_t)tag + ALIGN_UP(tag->size, MULTIBOOT_TAG_ALIGN))) {
bool is_required = !(tag->flags & MULTIBOOT_HEADER_TAG_OPTIONAL);
switch (tag->type) { switch (tag->type) {
case MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST: { case MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST: {
// Iterate the requests and check if they are supported by or not. // Iterate the requests and check if they are supported by or not.
struct multiboot_header_tag_information_request *request = (void *)tag; struct multiboot_header_tag_information_request *request = (void *)tag;
uint32_t size = (request->size - sizeof(struct multiboot_header_tag_information_request)) / sizeof(uint32_t); uint32_t size = (request->size - sizeof(struct multiboot_header_tag_information_request)) / sizeof(uint32_t);
bool is_required = !(request->flags & MULTIBOOT_HEADER_TAG_OPTIONAL);
for (uint32_t i = 0; i < size; i++) { for (uint32_t i = 0; i < size; i++) {
uint32_t r = request->requests[i]; uint32_t r = request->requests[i];
@ -192,7 +192,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
has_reloc_header = true; has_reloc_header = true;
break; break;
default: panic(true, "multiboot2: Unknown header tag type: %u\n", tag->type); default:
if (is_required)
panic(true, "multiboot2: Unknown header tag type: %u\n", tag->type);
} }
} }