RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 22:08:12 +00:00
Code Issues Activity Actions

UserspaceEmulator: Pass full path to new UE instance in virt$execve()

Browse source 
Don't just pass argv[0] to the new UE, pass the full program path.
This commit is contained in:
Andreas Kling 2020-08-07 17:27:38 +02:00
parent 91d259ef1c
commit ee5e8081da
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
DevTools/UserspaceEmulator/Emulator.cpp
View file

@ -963,6 +963,7 @@ int Emulator::virt$execve(FlatPtr params_addr)
report("\n"); report("\n");
report("==%d== \033[33;1mSyscall:\033[0m execve\n", getpid()); report("==%d== \033[33;1mSyscall:\033[0m execve\n", getpid());
report("==%d== @ %s\n", getpid(), path.characters());
for (auto& argument : arguments) for (auto& argument : arguments)
report("==%d== - %s\n", getpid(), argument.characters()); report("==%d== - %s\n", getpid(), argument.characters());
@ -970,6 +971,7 @@ int Emulator::virt$execve(FlatPtr params_addr)
Vector<char*> envp; Vector<char*> envp;
argv.append(const_cast<char*>("/bin/UserspaceEmulator")); argv.append(const_cast<char*>("/bin/UserspaceEmulator"));
argv.append(const_cast<char*>(path.characters()));
auto create_string_vector = [](auto& output_vector, auto& input_vector) { auto create_string_vector = [](auto& output_vector, auto& input_vector) {
for (auto& string : input_vector) for (auto& string : input_vector)
@ -980,6 +982,9 @@ int Emulator::virt$execve(FlatPtr params_addr)
create_string_vector(argv, arguments); create_string_vector(argv, arguments);
create_string_vector(envp, environment); create_string_vector(envp, environment);
// Yoink duplicated program name.
argv.remove(2);
return execve(argv[0], (char* const*)argv.data(), (char* const*)envp.data()); return execve(argv[0], (char* const*)argv.data(), (char* const*)envp.data());
} }