Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-29 07:47:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not read the header if it's not "PT_LOAD"

Browse Source
This commit is contained in:
Alex 2022-12-10 06:43:37 +02:00
parent b1e09147bf
commit bade38e173
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Execute/Spawn.cpp
View File

@ -183,18 +183,21 @@ namespace Execute
uintptr_t MAddr; uintptr_t MAddr;
if (ItrProgramHeader.p_type == PT_LOAD) if (ItrProgramHeader.p_type == PT_LOAD)
{
debug("PT_LOAD"); debug("PT_LOAD");
MAddr = (ItrProgramHeader.p_vaddr - BaseAddress) + (uintptr_t)MemoryImage;
memset(MemoryImage, 0, ItrProgramHeader.p_memsz);
memcpy(MemoryImage, (uint8_t *)BaseImage + ItrProgramHeader.p_offset, ItrProgramHeader.p_filesz);
debug("MemoryImage: %#lx", MemoryImage);
debug("MAddr: %#lx", MAddr);
debug("memset operation: 0 to %#lx for length %ld", MemoryImage + MAddr, ItrProgramHeader.p_memsz);
debug("memcpy operation: %#lx to %#lx for length %ld", (uint8_t *)BaseImage + ItrProgramHeader.p_offset, MemoryImage + MAddr, ItrProgramHeader.p_filesz);
}
else else
debug("Not PT_LOAD"); {
fixme("Not PT_LOAD (%ld)", ItrProgramHeader.p_type);
MAddr = (ItrProgramHeader.p_vaddr - BaseAddress) + (uintptr_t)MemoryImage; }
memset(MemoryImage, 0, ItrProgramHeader.p_memsz);
memcpy(MemoryImage, (uint8_t *)BaseImage + ItrProgramHeader.p_offset, ItrProgramHeader.p_filesz);
debug("MemoryImage: %#lx", MemoryImage);
debug("MAddr: %#lx", MAddr);
debug("memset operation: 0 to %#lx for length %ld", MemoryImage + MAddr, ItrProgramHeader.p_memsz);
debug("memcpy operation: %#lx to %#lx for length %ld", (uint8_t *)BaseImage + ItrProgramHeader.p_offset, MemoryImage + MAddr, ItrProgramHeader.p_filesz);
} }
debug("Entry Point: %#lx", ELFHeader->e_entry); debug("Entry Point: %#lx", ELFHeader->e_entry);

1
include/elf.h
View File

@ -239,6 +239,7 @@ enum SegmentTypes
PT_NOTE = 4, PT_NOTE = 4,
PT_SHLIB = 5, PT_SHLIB = 5,
PT_PHDR = 6, PT_PHDR = 6,
PT_TLS = 7,
PT_LOSUNW = 0x6ffffffa, PT_LOSUNW = 0x6ffffffa,
PT_SUNWBSS = 0x6ffffffb, PT_SUNWBSS = 0x6ffffffb,
PT_SUNWSTACK = 0x6ffffffa, PT_SUNWSTACK = 0x6ffffffa,