RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 06:58:11 +00:00
Code Issues Activity Actions

Kernel: Make copy_time_from_user() helpers use KResultOr<Time>

Browse source 
...and use TRY() for smooth error propagation everywhere.
This commit is contained in:
Andreas Kling 2021-09-06 22:22:14 +02:00
parent ef94c73a01
commit e6929835d2
6 changed files with 29 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Syscalls/select.cpp
View file

@ -26,10 +26,8 @@ KResultOr<FlatPtr> Process::sys$select(Userspace<const Syscall::SC_select_params
Thread::BlockTimeout timeout;
if (params.timeout) {
Optional<Time> timeout_time = copy_time_from_user(params.timeout);
if (!timeout_time.has_value())
return EFAULT;
timeout = Thread::BlockTimeout(false, &timeout_time.value());
auto timeout_time = TRY(copy_time_from_user(params.timeout));
timeout = Thread::BlockTimeout(false, &timeout_time);
}
auto current_thread = Thread::current();
@ -134,10 +132,8 @@ KResultOr<FlatPtr> Process::sys$poll(Userspace<const Syscall::SC_poll_params*> u
Thread::BlockTimeout timeout;
if (params.timeout) {
auto timeout_time = copy_time_from_user(params.timeout);
if (!timeout_time.has_value())
return EFAULT;
timeout = Thread::BlockTimeout(false, &timeout_time.value());
auto timeout_time = TRY(copy_time_from_user(params.timeout));
timeout = Thread::BlockTimeout(false, &timeout_time);
}
sigset_t sigmask = {};