Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DynamicLoader: Use canonical path for the main executable

This commit is contained in:
Bananymous 2025-11-10 21:50:59 +02:00
parent bb86520094
commit 46f9a9053f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
userspace/programs/DynamicLoader/main.cpp
View File

@ -1685,7 +1685,14 @@ uintptr_t _entry(int argc, char* argv[], char* envp[])
aux->a_type = LibELF::AT_IGNORE; aux->a_type = LibELF::AT_IGNORE;
} }
if (execfd == -1) char canonical[PATH_MAX];
if (execfd != -1)
{
if (long ret = syscall(SYS_READLINKAT, AT_FDCWD, "/proc/self/exe", canonical, sizeof(canonical)); ret < 0)
print_error_and_exit("could not read /proc/self/exe", ret);
}
else
{ {
if (argc < 2) if (argc < 2)
print_error_and_exit("missing program name", 0); print_error_and_exit("missing program name", 0);
@ -1696,10 +1703,13 @@ uintptr_t _entry(int argc, char* argv[], char* envp[])
execfd = syscall(SYS_OPENAT, AT_FDCWD, argv[0], O_RDONLY); execfd = syscall(SYS_OPENAT, AT_FDCWD, argv[0], O_RDONLY);
if (execfd < 0) if (execfd < 0)
print_error_and_exit("could not open program", execfd); print_error_and_exit("could not open program", execfd);
if (long ret = syscall(SYS_REALPATH, argv[0], canonical); ret < 0)
print_error_and_exit("could not get canonical path", ret);
} }
init_random(); init_random();
auto& elf = load_elf(argv[0], execfd); auto& elf = load_elf(canonical, execfd);
fini_random(); fini_random();
const auto master_tls = initialize_master_tls(); const auto master_tls = initialize_master_tls();