system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-18 15:32:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Expose maximum argument limit in sysconf

Browse source 
Move the definitions for maximum argument and environment size to
Process.h from execve.cpp. This allows sysconf(_SC_ARG_MAX) to return
the actual argument maximum of 128 KiB to userspace.
This commit is contained in:
Andrew Kaster 2022-02-13 12:07:51 -07:00 committed by Idan Horowitz
parent b0df096298
commit b4a7d148b1
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kernel/API/POSIX/unistd.h
View file

@ -40,6 +40,7 @@ enum {
_SC_CLK_TCK,
_SC_SYMLOOP_MAX,
_SC_MAPPED_FILES,
_SC_ARG_MAX,
};
#define _SC_MONOTONIC_CLOCK _SC_MONOTONIC_CLOCK
@ -53,6 +54,7 @@ enum {
#define _SC_CLK_TCK _SC_CLK_TCK
#define _SC_SYMLOOP_MAX _SC_SYMLOOP_MAX
#define _SC_MAPPED_FILES _SC_MAPPED_FILES
#define _SC_ARG_MAX _SC_ARG_MAX
#ifdef __cplusplus
}

2
Kernel/Process.h
View file

@ -434,6 +434,8 @@ public:
Custody* executable() { return m_executable.ptr(); }
const Custody* executable() const { return m_executable.ptr(); }
static constexpr size_t max_arguments_size = Thread::default_userspace_stack_size / 8;
static constexpr size_t max_environment_size = Thread::default_userspace_stack_size / 8;
NonnullOwnPtrVector<KString> const& arguments() const { return m_arguments; };
NonnullOwnPtrVector<KString> const& environment() const { return m_environment; };

7
Kernel/Syscalls/execve.cpp
View file

@ -58,13 +58,10 @@ static bool validate_stack_size(NonnullOwnPtrVector<KString> const& arguments, N
total_arguments_size += sizeof(char*) * (arguments.size() + 1);
total_environment_size += sizeof(char*) * (environment.size() + 1);
constexpr size_t max_arguments_size = Thread::default_userspace_stack_size / 8;
constexpr size_t max_environment_size = Thread::default_userspace_stack_size / 8;
if (total_arguments_size > max_arguments_size)
if (total_arguments_size > Process::max_arguments_size)
return false;
if (total_environment_size > max_environment_size)
if (total_environment_size > Process::max_environment_size)
return false;
// FIXME: This doesn't account for the size of the auxiliary vector

2
Kernel/Syscalls/sysconf.cpp
View file

@ -33,6 +33,8 @@ ErrorOr<FlatPtr> Process::sys$sysconf(int name)
return TimeManagement::the().ticks_per_second();
case _SC_SYMLOOP_MAX:
return Kernel::VirtualFileSystem::symlink_recursion_limit;
case _SC_ARG_MAX:
return Process::max_arguments_size;
default:
return EINVAL;
}