nathan/quark-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed broken ELF loader

Browse Source 
Only binaries less than a page long would load correctly.
This commit is contained in:
ngiddings
2021-04-19 06:56:03 -05:00
parent 470e39e8e8
commit 7300b9ecd6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/elf.c
View File

@@ -22,7 +22,7 @@ int load_program(struct elf_file_header_t *elf, struct page_stack_t *page_stack)
{ {
return S_OUT_OF_MEMORY; return S_OUT_OF_MEMORY;
} }
int status = map_page(page_stack, d, page, PAGE_RW | PAGE_USERMODE | PAGE_EXECUTABLE); int status = map_page(page_stack, d + n, page, PAGE_RW | PAGE_USERMODE | PAGE_EXECUTABLE);
switch(status) switch(status)
{ {
case S_OUT_OF_MEMORY: case S_OUT_OF_MEMORY:
@@ -30,7 +30,7 @@ int load_program(struct elf_file_header_t *elf, struct page_stack_t *page_stack)
case S_OUT_OF_BOUNDS: case S_OUT_OF_BOUNDS:
return status; return status;
case S_OK: case S_OK:
memcpy(d, s, page_size); memcpy(d + n, s + n, n + page_size < program_header->memsize ? page_size : program_header->memsize - n);
} }
} }
} }