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

multiboot2: Support load_addr == -1

Browse Source
This commit is contained in:
mintsuki 2022-10-30 11:19:02 +01:00
parent 2fab5311d8
commit 88d99fa34b
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
common/protos/multiboot2.c
View File

@ -203,22 +203,34 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
uint64_t ranges_count; uint64_t ranges_count;
if (addresstag != NULL) { if (addresstag != NULL) {
if (addresstag->load_addr > addresstag->header_addr)
panic(true, "multiboot2: Illegal load address");
size_t load_size;
if (addresstag->load_end_addr)
load_size = addresstag->load_end_addr - addresstag->load_addr;
else
load_size = kernel_file_size;
size_t header_offset = (size_t)header - (size_t)kernel; size_t header_offset = (size_t)header - (size_t)kernel;
uint32_t bss_size = 0; uintptr_t load_src, load_addr;
if (addresstag->bss_end_addr) { if (addresstag->load_addr != (uint32_t)-1) {
uintptr_t bss_addr = addresstag->load_addr + load_size; if (addresstag->load_addr > addresstag->header_addr) {
if (addresstag->bss_end_addr < bss_addr) panic(true, "multiboot2: Illegal load address");
}
load_src = header_offset - (addresstag->header_addr - addresstag->load_addr);
load_addr = addresstag->load_addr;
} else {
load_src = 0;
load_addr = addresstag->header_addr - header_offset;
}
size_t load_size;
if (addresstag->load_end_addr != 0) {
load_size = addresstag->load_end_addr - load_addr;
} else {
load_size = kernel_file_size - load_src;
}
size_t bss_size = 0;
if (addresstag->bss_end_addr != 0) {
uintptr_t bss_addr = load_addr + load_size;
if (addresstag->bss_end_addr < bss_addr) {
panic(true, "multiboot2: Illegal bss end address"); panic(true, "multiboot2: Illegal bss end address");
}
bss_size = addresstag->bss_end_addr - bss_addr; bss_size = addresstag->bss_end_addr - bss_addr;
} }
@ -227,8 +239,7 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
void *elsewhere = ext_mem_alloc(full_size); void *elsewhere = ext_mem_alloc(full_size);
memcpy(elsewhere, kernel + (header_offset memcpy(elsewhere, kernel + load_src, load_size);
- (addresstag->header_addr - addresstag->load_addr)), load_size);
if (entry_point == 0xffffffff) { if (entry_point == 0xffffffff) {
panic(true, "multiboot2: Using address tag but entry address tag missing"); panic(true, "multiboot2: Using address tag but entry address tag missing");
@ -238,7 +249,7 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
ranges = ext_mem_alloc(sizeof(struct elsewhere_range)); ranges = ext_mem_alloc(sizeof(struct elsewhere_range));
ranges->elsewhere = (uintptr_t)elsewhere; ranges->elsewhere = (uintptr_t)elsewhere;
ranges->target = addresstag->load_addr; ranges->target = load_addr;
ranges->length = full_size; ranges->length = full_size;
} else { } else {
uint64_t e; uint64_t e;