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

multiboot2: Fix broken section list size calculation (2)

Browse Source
This commit is contained in:
mintsuki 2022-06-19 00:30:01 +02:00
parent 26521c6dff
commit dc71fe7f12
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/elf.c
View File

@ -311,7 +311,6 @@ struct elf_section_hdr_info* elf64_section_hdr_info(uint8_t *elf) {
info->num = hdr.sh_num; info->num = hdr.sh_num;
info->section_entry_size = hdr.shdr_size; info->section_entry_size = hdr.shdr_size;
info->section_hdr_size = info->num * info->section_entry_size;
info->str_section_idx = hdr.shstrndx; info->str_section_idx = hdr.shstrndx;
info->section_offset = hdr.shoff; info->section_offset = hdr.shoff;
@ -328,7 +327,6 @@ struct elf_section_hdr_info* elf32_section_hdr_info(uint8_t *elf) {
info->num = hdr.sh_num; info->num = hdr.sh_num;
info->section_entry_size = hdr.shdr_size; info->section_entry_size = hdr.shdr_size;
info->section_hdr_size = info->num * info->section_entry_size;
info->str_section_idx = hdr.shstrndx; info->str_section_idx = hdr.shstrndx;
info->section_offset = hdr.shoff; info->section_offset = hdr.shoff;

1
common/lib/elf.h
View File

@ -18,7 +18,6 @@ struct elf_range {
}; };
struct elf_section_hdr_info { struct elf_section_hdr_info {
uint32_t section_hdr_size;
uint32_t section_entry_size; uint32_t section_entry_size;
uint32_t str_section_idx; uint32_t str_section_idx;
uint32_t num; uint32_t num;

11
common/protos/multiboot2.c
View File

@ -26,7 +26,7 @@
static size_t get_multiboot2_info_size( static size_t get_multiboot2_info_size(
char *cmdline, char *cmdline,
size_t modules_size, size_t modules_size,
uint32_t section_hdr_size, uint32_t section_num, uint32_t section_entry_size, uint32_t section_num,
uint32_t smbios_tag_size uint32_t smbios_tag_size
) { ) {
return ALIGN_UP(sizeof(struct multiboot2_start_tag), MULTIBOOT_TAG_ALIGN) + // start return ALIGN_UP(sizeof(struct multiboot2_start_tag), MULTIBOOT_TAG_ALIGN) + // start
@ -35,7 +35,7 @@ static size_t get_multiboot2_info_size(
ALIGN_UP(sizeof(struct multiboot_tag_framebuffer), MULTIBOOT_TAG_ALIGN) + // framebuffer ALIGN_UP(sizeof(struct multiboot_tag_framebuffer), MULTIBOOT_TAG_ALIGN) + // framebuffer
ALIGN_UP(sizeof(struct multiboot_tag_new_acpi) + sizeof(struct rsdp), MULTIBOOT_TAG_ALIGN) + // new ACPI info ALIGN_UP(sizeof(struct multiboot_tag_new_acpi) + sizeof(struct rsdp), MULTIBOOT_TAG_ALIGN) + // new ACPI info
ALIGN_UP(sizeof(struct multiboot_tag_old_acpi) + 20, MULTIBOOT_TAG_ALIGN) + // old ACPI info ALIGN_UP(sizeof(struct multiboot_tag_old_acpi) + 20, MULTIBOOT_TAG_ALIGN) + // old ACPI info
ALIGN_UP(sizeof(struct multiboot_tag_elf_sections) + section_hdr_size * section_num, MULTIBOOT_TAG_ALIGN) + // ELF info ALIGN_UP(sizeof(struct multiboot_tag_elf_sections) + section_entry_size * section_num, MULTIBOOT_TAG_ALIGN) + // ELF info
ALIGN_UP(modules_size, MULTIBOOT_TAG_ALIGN) + // modules ALIGN_UP(modules_size, MULTIBOOT_TAG_ALIGN) + // modules
ALIGN_UP(smbios_tag_size, MULTIBOOT_TAG_ALIGN) + // SMBIOS ALIGN_UP(smbios_tag_size, MULTIBOOT_TAG_ALIGN) + // SMBIOS
ALIGN_UP(sizeof(struct multiboot_tag_basic_meminfo), MULTIBOOT_TAG_ALIGN) + // basic memory info ALIGN_UP(sizeof(struct multiboot_tag_basic_meminfo), MULTIBOOT_TAG_ALIGN) + // basic memory info
@ -286,7 +286,8 @@ bool multiboot2_load(char *config, char* cmdline) {
size_t mb2_info_size = get_multiboot2_info_size( size_t mb2_info_size = get_multiboot2_info_size(
cmdline, cmdline,
modules_size, modules_size,
section_hdr_info ? section_hdr_info->section_hdr_size : 0, section_hdr_info->num, section_hdr_info ? section_hdr_info->section_entry_size * section_hdr_info->num : 0,
section_hdr_info ? section_hdr_info->num : 0,
smbios_tag_size smbios_tag_size
); );
@ -304,7 +305,7 @@ bool multiboot2_load(char *config, char* cmdline) {
panic(true, "multiboot2: Cannot return ELF file information"); panic(true, "multiboot2: Cannot return ELF file information");
} }
} else { } else {
uint32_t size = sizeof(struct multiboot_tag_elf_sections) + section_hdr_info->section_hdr_size * section_hdr_info->num; uint32_t size = sizeof(struct multiboot_tag_elf_sections) + section_hdr_info->section_entry_size * section_hdr_info->num;
struct multiboot_tag_elf_sections *tag = (struct multiboot_tag_elf_sections*)(mb2_info + info_idx); struct multiboot_tag_elf_sections *tag = (struct multiboot_tag_elf_sections*)(mb2_info + info_idx);
tag->type = MULTIBOOT_TAG_TYPE_ELF_SECTIONS; tag->type = MULTIBOOT_TAG_TYPE_ELF_SECTIONS;
@ -314,7 +315,7 @@ bool multiboot2_load(char *config, char* cmdline) {
tag->entsize = section_hdr_info->section_entry_size; tag->entsize = section_hdr_info->section_entry_size;
tag->shndx = section_hdr_info->str_section_idx; tag->shndx = section_hdr_info->str_section_idx;
memcpy(tag->sections, kernel + section_hdr_info->section_offset, section_hdr_info->section_hdr_size * section_hdr_info->num); memcpy(tag->sections, kernel + section_hdr_info->section_offset, section_hdr_info->section_entry_size * section_hdr_info->num);
for (size_t i = 0; i < section_hdr_info->num; i++) { for (size_t i = 0; i < section_hdr_info->num; i++) {
struct elf64_shdr *shdr = (void *)kernel + section_hdr_info->section_offset + i * section_hdr_info->section_entry_size; struct elf64_shdr *shdr = (void *)kernel + section_hdr_info->section_offset + i * section_hdr_info->section_entry_size;