enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-30 08:17:58 +00:00
Code Issues Actions Releases Wiki Activity

kernel/elf: Update ELFObject()

Browse Source 
Why did I wrote that?

The interpreter wants argv[0] to be the path of the program to be loaded.

Signed-off-by: EnderIce2 <enderice2@users.noreply.github.com>
This commit is contained in:
EnderIce2 2024-12-11 04:50:42 +02:00
parent 8b026175bb
commit 6f17b29963
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -811,36 +811,15 @@ namespace Execute
Elf32_Ehdr ELFHeader{}; Elf32_Ehdr ELFHeader{};
fd->Read(&ELFHeader, sizeof(Elf32_Ehdr), 0); fd->Read(&ELFHeader, sizeof(Elf32_Ehdr), 0);
std::vector<Elf64_Phdr> PhdrINTERP = ELFGetSymbolType_x86_64(fd, PT_INTERP);
const char *ElfInterpPath = nullptr;
if (!PhdrINTERP.empty() && ELFHeader.e_type == ET_DYN)
{
ElfInterpPath = new char[256];
fd->Read(ElfInterpPath, 256, PhdrINTERP.front().p_offset);
debug("Interpreter: %s", ElfInterpPath);
argc++;
}
// ELFargv = new const char *[argc + 2]; // ELFargv = new const char *[argc + 2];
size_t argv_size = argc + 2 * sizeof(char *); size_t argv_size = argc + 2 * sizeof(char *);
ELFargv = (const char **)TargetProcess->vma->RequestPages(TO_PAGES(argv_size)); ELFargv = (const char **)TargetProcess->vma->RequestPages(TO_PAGES(argv_size));
int interAdd = 0; for (int i = 0; i < argc; i++)
if (ElfInterpPath)
{ {
size_t interp_size = strlen(ElfInterpPath) + 1; size_t arg_size = strlen(argv[i]) + 1;
ELFargv[0] = (const char *)TargetProcess->vma->RequestPages(TO_PAGES(interp_size));
strcpy((char *)ELFargv[0], ElfInterpPath);
delete[] ElfInterpPath;
interAdd++;
}
for (int i = interAdd; i < argc; i++)
{
assert(argv[i - interAdd] != nullptr);
size_t arg_size = strlen(argv[i - interAdd]) + 1;
ELFargv[i] = (const char *)TargetProcess->vma->RequestPages(TO_PAGES(arg_size)); ELFargv[i] = (const char *)TargetProcess->vma->RequestPages(TO_PAGES(arg_size));
strcpy((char *)ELFargv[i], argv[i - interAdd]); strcpy((char *)ELFargv[i], argv[i]);
} }
ELFargv[argc] = nullptr; ELFargv[argc] = nullptr;