RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 19:22:45 +00:00
Code Issues Activity Actions

Kernel: Remove SmapDisabler in futex()

Browse source
This commit is contained in:
Andreas Kling 2020-01-06 11:44:15 +01:00
parent a30fb5c5c1
commit 6af8392cf8
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Kernel/Process.cpp
View file

@ -4016,27 +4016,35 @@ WaitQueue& Process::futex_queue(i32* userspace_address)
return *queue; return *queue;
} }
int Process::sys$futex(const Syscall::SC_futex_params* params) int Process::sys$futex(const Syscall::SC_futex_params* user_params)
{ {
if (!validate_read_typed(params)) if (!validate_read_typed(user_params))
return -EFAULT; return -EFAULT;
SmapDisabler disabler; Syscall::SC_futex_params params;
copy_from_user(&params, user_params, sizeof(params));
i32* userspace_address = params->userspace_address; i32* userspace_address = params.userspace_address;
int futex_op = params->futex_op; int futex_op = params.futex_op;
i32 value = params->val; i32 value = params.val;
const timespec* timeout = params->timeout; const timespec* user_timeout = params.timeout;
if (!validate_read_typed(userspace_address)) if (!validate_read_typed(userspace_address))
return -EFAULT; return -EFAULT;
if (timeout && !validate_read_typed(timeout)) if (user_timeout && !validate_read_typed(user_timeout))
return -EFAULT; return -EFAULT;
timespec timeout { 0, 0 };
if (user_timeout)
copy_from_user(&timeout, user_timeout, sizeof(timeout));
i32 user_value;
switch (futex_op) { switch (futex_op) {
case FUTEX_WAIT: case FUTEX_WAIT:
if (*userspace_address != value) copy_from_user(&user_value, userspace_address, sizeof(user_value));
if (user_value != value)
return -EAGAIN; return -EAGAIN;
// FIXME: This is supposed to be interruptible by a signal, but right now WaitQueue cannot be interrupted. // FIXME: This is supposed to be interruptible by a signal, but right now WaitQueue cannot be interrupted.
// FIXME: Support timeout! // FIXME: Support timeout!