enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-28 15:34:31 +00:00
Code Issues Actions Releases Wiki Activity

fix(kernel/elf): segment mapping and handling of program headers were wrongly implemented

Browse Source 
Signed-off-by: EnderIce2 <enderice2@protonmail.com>
This commit is contained in:
EnderIce2 2025-03-27 15:55:29 +00:00
parent 6240d6638f
commit 36c5c8ad67
Signed by: enderice2
GPG Key ID: FEB6B8A8507BA62E
1 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Kernel/exec/elf/elf_loader.cpp
View File

@ -157,37 +157,39 @@ namespace Execute
if (ProgramHeader.p_memsz == 0) if (ProgramHeader.p_memsz == 0)
continue; continue;
void *pAddr = vma->RequestPages(TO_PAGES(ProgramHeader.p_memsz), true); void *pAddr = vma->RequestPages(TO_PAGES(ProgramHeader.p_memsz + (ProgramHeader.p_vaddr % PAGE_SIZE)), true);
void *vAddr = (void *)ALIGN_DOWN(ProgramHeader.p_vaddr, ProgramHeader.p_align); void *vAddr = (void *)ALIGN_DOWN(ProgramHeader.p_vaddr, PAGE_SIZE);
uintptr_t SegDestOffset = ProgramHeader.p_vaddr - uintptr_t(vAddr); uintptr_t destOffset = ProgramHeader.p_vaddr - uintptr_t(vAddr);
vmm.Map(vAddr, pAddr, size_t totalSize = ALIGN_UP(destOffset + ProgramHeader.p_memsz, PAGE_SIZE);
ALIGN_UP(ProgramHeader.p_memsz, ProgramHeader.p_align), vmm.Map(vAddr, pAddr, totalSize, Memory::RW | Memory::US);
Memory::RW | Memory::US);
debug("Mapped %#lx to %#lx (%ld bytes)", debug("Mapped %#lx-%#lx to %#lx-%#lx (%#lx bytes)",
vAddr, pAddr, ProgramHeader.p_memsz); uintptr_t(pAddr), uintptr_t(pAddr) + totalSize,
debug("Segment Offset is %#lx", SegDestOffset); uintptr_t(vAddr), uintptr_t(vAddr) + totalSize, totalSize);
debug("Segment Offset is %#lx", destOffset);
debug("Copying PT_LOAD to p: %#lx-%#lx; v: %#lx-%#lx (%ld file bytes, %ld mem bytes)", debug("Copying PT_LOAD to p: %#lx-%#lx; v: %#lx-%#lx (%ld file bytes, %ld mem bytes)",
uintptr_t(pAddr) + SegDestOffset, uintptr_t(pAddr) + destOffset,
uintptr_t(pAddr) + SegDestOffset + ProgramHeader.p_memsz, uintptr_t(pAddr) + destOffset + ProgramHeader.p_memsz,
ProgramHeader.p_vaddr, ProgramHeader.p_vaddr,
ProgramHeader.p_vaddr + ProgramHeader.p_memsz, 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)
{ {
debug("%d %#lx %d", ProgramHeader.p_offset, (uint8_t *)pAddr + SegDestOffset, ProgramHeader.p_filesz); debug("%d %#lx %d", ProgramHeader.p_offset, (uint8_t *)pAddr + destOffset, ProgramHeader.p_filesz);
fd->Read((uint8_t *)pAddr + SegDestOffset, ProgramHeader.p_filesz, ProgramHeader.p_offset); fd->Read((uint8_t *)pAddr + destOffset, ProgramHeader.p_filesz, ProgramHeader.p_offset);
} }
if (ProgramHeader.p_memsz - ProgramHeader.p_filesz > 0) if (ProgramHeader.p_memsz - ProgramHeader.p_filesz > 0)
{ {
void *zAddr = (void *)(uintptr_t(pAddr) + SegDestOffset + ProgramHeader.p_filesz); void *zAddr = (void *)(uintptr_t(pAddr) + destOffset + ProgramHeader.p_filesz);
debug("Zeroing %d bytes at %#lx", debug("Zeroing %d bytes at %#lx (%#lx-%#lx)",
ProgramHeader.p_memsz - ProgramHeader.p_filesz, zAddr); ProgramHeader.p_memsz - ProgramHeader.p_filesz, zAddr,
ProgramHeader.p_vaddr + ProgramHeader.p_filesz,
ProgramHeader.p_vaddr + ProgramHeader.p_memsz);
memset(zAddr, 0, ProgramHeader.p_memsz - ProgramHeader.p_filesz); memset(zAddr, 0, ProgramHeader.p_memsz - ProgramHeader.p_filesz);
} }
@ -259,28 +261,56 @@ namespace Execute
debug("ELFProgramHeaders: %#lx", ELFProgramHeaders); debug("ELFProgramHeaders: %#lx", ELFProgramHeaders);
break; break;
} }
case 0x6474E550: /* PT_GNU_EH_FRAME */ case PT_GNU_EH_FRAME:
{ {
fixme("PT_GNU_EH_FRAME"); fixme("PT_GNU_EH_FRAME");
break; break;
} }
case 0x6474e551: /* PT_GNU_STACK */ case PT_GNU_STACK:
{ {
fixme("PT_GNU_STACK"); Elf_Phdr gnuStack = ProgramHeader;
fixme("EXSTACK: %d", gnuStack.p_flags & PF_X);
break; break;
} }
case 0x6474e552: /* PT_GNU_RELRO */ case PT_GNU_RELRO:
{ {
fixme("PT_GNU_RELRO"); fixme("PT_GNU_RELRO");
break; break;
} }
case 0x6474e553: /* PT_GNU_PROPERTY */ case PT_GNU_PROPERTY:
{ {
fixme("PT_GNU_PROPERTY"); Elf64_Nhdr NoteHeader;
fd->Read(&NoteHeader, sizeof(Elf64_Nhdr), ProgramHeader.p_offset);
#define NT_GNU_PROPERTY_TYPE_0 5
if (NoteHeader.n_type == NT_GNU_PROPERTY_TYPE_0)
{
char noteName[0x400];
fd->Read(noteName, NoteHeader.n_namesz, ProgramHeader.p_offset + sizeof(Elf64_Nhdr));
noteName[NoteHeader.n_namesz - 1] = '\0';
if (strcmp(noteName, "GNU") == 0)
{
debug("GNU Property Note found");
}
else
{
warn("Unexpected note name in PT_GNU_PROPERTY: %s", noteName);
}
}
else
{
warn("Unhandled note type in PT_GNU_PROPERTY: %#lx", NoteHeader.n_type);
}
break; break;
} }
case PT_INTERP: case PT_INTERP:
break; break;
case PT_LOPROC ... PT_HIPROC:
{
debug("i guess i ignore this? %#lx", ProgramHeader.p_type);
break;
}
default: default:
{ {
fixme("Unhandled program header type: %#lx", fixme("Unhandled program header type: %#lx",