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

Kernel: Use TRY() when validating clock_id in TimeManagement

Browse source 
Gets rid of a bit of code duplication, and makes the API more consistent
with the style we are moving towards.
This commit is contained in:
Brian Gianforcaro 2022-02-21 13:53:43 -08:00 • committed by Brian Gianforcaro
parent e167cafa70
commit d05fa14e52
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/Syscalls/clock.cpp
View file

@ -27,8 +27,7 @@ ErrorOr<FlatPtr> Process::sys$clock_gettime(clockid_t clock_id, Userspace<timesp
VERIFY_NO_PROCESS_BIG_LOCK(this); VERIFY_NO_PROCESS_BIG_LOCK(this);
TRY(require_promise(Pledge::stdio)); TRY(require_promise(Pledge::stdio));
if (!TimeManagement::is_valid_clock_id(clock_id)) TRY(TimeManagement::validate_clock_id(clock_id));
return EINVAL;
auto ts = TimeManagement::the().current_time(clock_id).to_timespec(); auto ts = TimeManagement::the().current_time(clock_id).to_timespec();
TRY(copy_to_user(user_ts, &ts)); TRY(copy_to_user(user_ts, &ts));
@ -75,8 +74,7 @@ ErrorOr<FlatPtr> Process::sys$clock_nanosleep(Userspace<const Syscall::SC_clock_
return EINVAL; return EINVAL;
} }
if (!TimeManagement::is_valid_clock_id(params.clock_id)) TRY(TimeManagement::validate_clock_id(params.clock_id));
return EINVAL;
bool was_interrupted; bool was_interrupted;
if (is_absolute) { if (is_absolute) {

6
Kernel/Time/TimeManagement.cpp
View file

@ -37,7 +37,7 @@ TimeManagement& TimeManagement::the()
return *s_the; return *s_the;
} }
bool TimeManagement::is_valid_clock_id(clockid_t clock_id) ErrorOr<void> TimeManagement::validate_clock_id(clockid_t clock_id)
{ {
switch (clock_id) { switch (clock_id) {
case CLOCK_MONOTONIC: case CLOCK_MONOTONIC:
@ -45,9 +45,9 @@ bool TimeManagement::is_valid_clock_id(clockid_t clock_id)
case CLOCK_MONOTONIC_RAW: case CLOCK_MONOTONIC_RAW:
case CLOCK_REALTIME: case CLOCK_REALTIME:
case CLOCK_REALTIME_COARSE: case CLOCK_REALTIME_COARSE:
return true; return {};
default: default:
return false; return EINVAL;
}; };
} }

2
Kernel/Time/TimeManagement.h
View file

@ -36,7 +36,7 @@ public:
static bool is_initialized(); static bool is_initialized();
static TimeManagement& the(); static TimeManagement& the();
static bool is_valid_clock_id(clockid_t); static ErrorOr<void> validate_clock_id(clockid_t);
Time current_time(clockid_t) const; Time current_time(clockid_t) const;
Time monotonic_time(TimePrecision = TimePrecision::Coarse) const; Time monotonic_time(TimePrecision = TimePrecision::Coarse) const;
Time monotonic_time_raw() const Time monotonic_time_raw() const