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

Kernel: Remove SmapDisabler in sys$clock_gettime()

Browse source
This commit is contained in:
Andreas Kling 2020-02-16 08:13:11 +01:00
parent 7533d61458
commit 7717084ac7
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Kernel/Process.cpp
View file

@ -4183,22 +4183,25 @@ int Process::sys$setkeymap(const Syscall::SC_setkeymap_params* user_params)
return 0; return 0;
} }
int Process::sys$clock_gettime(clockid_t clock_id, timespec* ts) int Process::sys$clock_gettime(clockid_t clock_id, timespec* user_ts)
{ {
REQUIRE_PROMISE(stdio); REQUIRE_PROMISE(stdio);
if (!validate_write_typed(ts)) if (!validate_write_typed(user_ts))
return -EFAULT; return -EFAULT;
SmapDisabler disabler; timespec ts;
memset(&ts, 0, sizeof(ts));
switch (clock_id) { switch (clock_id) {
case CLOCK_MONOTONIC: case CLOCK_MONOTONIC:
ts->tv_sec = g_uptime / TICKS_PER_SECOND; ts.tv_sec = g_uptime / TICKS_PER_SECOND;
ts->tv_nsec = (g_uptime % TICKS_PER_SECOND) * 1000000; ts.tv_nsec = (g_uptime % TICKS_PER_SECOND) * 1000000;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
copy_to_user(user_ts, &ts);
return 0; return 0;
} }