RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:57:35 +00:00
Code Issues Activity Actions

Kernel: Rename Syscall::SyscallString => Syscall::StringArgument

Browse source
This commit is contained in:
Andreas Kling 2020-01-10 20:15:58 +01:00
parent 0695ff8282
commit 416c7ac2b5
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Process.cpp
View file

@ -932,9 +932,9 @@ int Process::sys$execve(const Syscall::SC_execve_params* user_params)
return true; return true;
if (!validate_read_typed(list.strings, list.length)) if (!validate_read_typed(list.strings, list.length))
return false; return false;
Vector<Syscall::SyscallString, 32> strings; Vector<Syscall::StringArgument, 32> strings;
strings.resize(list.length); strings.resize(list.length);
copy_from_user(strings.data(), list.strings, list.length * sizeof(Syscall::SyscallString)); copy_from_user(strings.data(), list.strings, list.length * sizeof(Syscall::StringArgument));
for (size_t i = 0; i < list.length; ++i) { for (size_t i = 0; i < list.length; ++i) {
if (!validate_read(strings[i].characters, strings[i].length)) if (!validate_read(strings[i].characters, strings[i].length))
return false; return false;

8
Kernel/Syscall.h
View file

@ -300,7 +300,7 @@ struct SC_set_mmap_name_params {
size_t name_length; size_t name_length;
}; };
struct SyscallString { struct StringArgument {
const char* characters { nullptr }; const char* characters { nullptr };
size_t length { 0 }; size_t length { 0 };
}; };
@ -312,18 +312,18 @@ struct MutableBufferArgument {
}; };
struct SyscallStringList { struct SyscallStringList {
SyscallString* strings { nullptr }; StringArgument* strings { nullptr };
size_t length { 0 }; size_t length { 0 };
}; };
struct SC_execve_params { struct SC_execve_params {
SyscallString path; StringArgument path;
SyscallStringList arguments; SyscallStringList arguments;
SyscallStringList environment; SyscallStringList environment;
}; };
struct SC_readlink_params { struct SC_readlink_params {
SyscallString path; StringArgument path;
MutableBufferArgument<char, size_t> buffer; MutableBufferArgument<char, size_t> buffer;
}; };

4
Libraries/LibC/unistd.cpp
View file

@ -67,8 +67,8 @@ int execve(const char* filename, char* const argv[], char* const envp[])
}; };
Syscall::SC_execve_params params; Syscall::SC_execve_params params;
params.arguments.strings = (Syscall::SyscallString*)alloca(arg_count * sizeof(Syscall::SyscallString)); params.arguments.strings = (Syscall::StringArgument*)alloca(arg_count * sizeof(Syscall::StringArgument));
params.environment.strings = (Syscall::SyscallString*)alloca(env_count * sizeof(Syscall::SyscallString)); params.environment.strings = (Syscall::StringArgument*)alloca(env_count * sizeof(Syscall::StringArgument));
params.path = { filename, strlen(filename) }; params.path = { filename, strlen(filename) };
copy_strings(argv, arg_count, params.arguments); copy_strings(argv, arg_count, params.arguments);