Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-27 15:04:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix elf binaries were loaded wrongly

Browse Source
This commit is contained in:
Alex 2023-10-09 03:59:24 +03:00
parent 889e1522a3
commit bd04d2bf2f
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
exec/elf/elf_loader.cpp
View File

@ -183,28 +183,32 @@ namespace Execute
continue; continue;
void *pAddr = vma->RequestPages(TO_PAGES(ProgramHeader.p_memsz), true); void *pAddr = vma->RequestPages(TO_PAGES(ProgramHeader.p_memsz), true);
void *SegmentDestination = (void *)ProgramHeader.p_vaddr; void *vAddr = (void *)ALIGN_DOWN(ProgramHeader.p_vaddr, PAGE_SIZE);
uintptr_t SegDestOffset = ProgramHeader.p_vaddr - uintptr_t(vAddr);
vmm.Map(SegmentDestination, pAddr, vmm.Map(vAddr, pAddr,
ProgramHeader.p_memsz, ProgramHeader.p_memsz,
Memory::P | Memory::RW | Memory::US); Memory::P | Memory::RW | Memory::US);
debug("Mapped %#lx to %#lx", SegmentDestination, pAddr); debug("Mapped %#lx to %#lx", vAddr, pAddr);
debug("Segment Offset is %#lx", SegDestOffset);
debug("Copying segment to p: %#lx-%#lx; v: %#lx-%#lx (%ld file bytes, %ld mem bytes)", debug("Copying segment to p: %#lx-%#lx; v: %#lx-%#lx (%ld file bytes, %ld mem bytes)",
pAddr, uintptr_t(pAddr) + ProgramHeader.p_memsz, uintptr_t(pAddr) + SegDestOffset,
SegmentDestination, uintptr_t(SegmentDestination) + ProgramHeader.p_memsz, uintptr_t(pAddr) + SegDestOffset + ProgramHeader.p_memsz,
ProgramHeader.p_vaddr,
ProgramHeader.p_vaddr + ProgramHeader.p_memsz,
ProgramHeader.p_filesz, ProgramHeader.p_memsz); ProgramHeader.p_filesz, ProgramHeader.p_memsz);
if (ProgramHeader.p_filesz > 0) if (ProgramHeader.p_filesz > 0)
{ {
lseek(fd, ProgramHeader.p_offset, SEEK_SET); lseek(fd, ProgramHeader.p_offset, SEEK_SET);
fread(fd, (uint8_t *)pAddr, ProgramHeader.p_filesz); fread(fd, (uint8_t *)pAddr + SegDestOffset, ProgramHeader.p_filesz);
} }
if (ProgramHeader.p_memsz - ProgramHeader.p_filesz > 0) if (ProgramHeader.p_memsz - ProgramHeader.p_filesz > 0)
{ {
void *zAddr = (void *)(uintptr_t(pAddr) + ProgramHeader.p_filesz); void *zAddr = (void *)(uintptr_t(pAddr) + SegDestOffset + ProgramHeader.p_filesz);
memset(zAddr, 0, ProgramHeader.p_memsz - ProgramHeader.p_filesz); memset(zAddr, 0, ProgramHeader.p_memsz - ProgramHeader.p_filesz);
} }
ProgramBreakHeader = ProgramHeader; ProgramBreakHeader = ProgramHeader;