Skip to content

Commit faf13e2

Browse files
author
MarcoFalke
committed
Add missing gettimeofday to syscall sandbox
Also, sort entries. Can be reviewed with: --color-moved=dimmed-zebra
1 parent 077e98c commit faf13e2

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

src/util/syscall_sandbox.cpp

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
169169
{__NR_ftruncate, "ftruncate"},
170170
{__NR_futex, "futex"},
171171
{__NR_futimesat, "futimesat"},
172+
{__NR_get_kernel_syms, "get_kernel_syms"},
173+
{__NR_get_mempolicy, "get_mempolicy"},
174+
{__NR_get_robust_list, "get_robust_list"},
175+
{__NR_get_thread_area, "get_thread_area"},
172176
{__NR_getcpu, "getcpu"},
173177
{__NR_getcwd, "getcwd"},
174178
{__NR_getdents, "getdents"},
@@ -178,8 +182,6 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
178182
{__NR_getgid, "getgid"},
179183
{__NR_getgroups, "getgroups"},
180184
{__NR_getitimer, "getitimer"},
181-
{__NR_get_kernel_syms, "get_kernel_syms"},
182-
{__NR_get_mempolicy, "get_mempolicy"},
183185
{__NR_getpeername, "getpeername"},
184186
{__NR_getpgid, "getpgid"},
185187
{__NR_getpgrp, "getpgrp"},
@@ -191,12 +193,10 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
191193
{__NR_getresgid, "getresgid"},
192194
{__NR_getresuid, "getresuid"},
193195
{__NR_getrlimit, "getrlimit"},
194-
{__NR_get_robust_list, "get_robust_list"},
195196
{__NR_getrusage, "getrusage"},
196197
{__NR_getsid, "getsid"},
197198
{__NR_getsockname, "getsockname"},
198199
{__NR_getsockopt, "getsockopt"},
199-
{__NR_get_thread_area, "get_thread_area"},
200200
{__NR_gettid, "gettid"},
201201
{__NR_gettimeofday, "gettimeofday"},
202202
{__NR_getuid, "getuid"},
@@ -207,15 +207,15 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
207207
{__NR_inotify_init1, "inotify_init1"},
208208
{__NR_inotify_rm_watch, "inotify_rm_watch"},
209209
{__NR_io_cancel, "io_cancel"},
210-
{__NR_ioctl, "ioctl"},
211210
{__NR_io_destroy, "io_destroy"},
212211
{__NR_io_getevents, "io_getevents"},
212+
{__NR_io_setup, "io_setup"},
213+
{__NR_io_submit, "io_submit"},
214+
{__NR_ioctl, "ioctl"},
213215
{__NR_ioperm, "ioperm"},
214216
{__NR_iopl, "iopl"},
215217
{__NR_ioprio_get, "ioprio_get"},
216218
{__NR_ioprio_set, "ioprio_set"},
217-
{__NR_io_setup, "io_setup"},
218-
{__NR_io_submit, "io_submit"},
219219
{__NR_kcmp, "kcmp"},
220220
{__NR_kexec_file_load, "kexec_file_load"},
221221
{__NR_kexec_load, "kexec_load"},
@@ -271,8 +271,8 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
271271
{__NR_newfstatat, "newfstatat"},
272272
{__NR_nfsservctl, "nfsservctl"},
273273
{__NR_open, "open"},
274-
{__NR_openat, "openat"},
275274
{__NR_open_by_handle_at, "open_by_handle_at"},
275+
{__NR_openat, "openat"},
276276
{__NR_pause, "pause"},
277277
{__NR_perf_event_open, "perf_event_open"},
278278
{__NR_personality, "personality"},
@@ -307,6 +307,7 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
307307
#ifdef __NR_pwritev2
308308
{__NR_pwritev2, "pwritev2"},
309309
#endif
310+
{__NR__sysctl, "_sysctl"},
310311
{__NR_query_module, "query_module"},
311312
{__NR_quotactl, "quotactl"},
312313
{__NR_read, "read"},
@@ -334,11 +335,11 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
334335
{__NR_rt_sigsuspend, "rt_sigsuspend"},
335336
{__NR_rt_sigtimedwait, "rt_sigtimedwait"},
336337
{__NR_rt_tgsigqueueinfo, "rt_tgsigqueueinfo"},
338+
{__NR_sched_get_priority_max, "sched_get_priority_max"},
339+
{__NR_sched_get_priority_min, "sched_get_priority_min"},
337340
{__NR_sched_getaffinity, "sched_getaffinity"},
338341
{__NR_sched_getattr, "sched_getattr"},
339342
{__NR_sched_getparam, "sched_getparam"},
340-
{__NR_sched_get_priority_max, "sched_get_priority_max"},
341-
{__NR_sched_get_priority_min, "sched_get_priority_min"},
342343
{__NR_sched_getscheduler, "sched_getscheduler"},
343344
{__NR_sched_rr_get_interval, "sched_rr_get_interval"},
344345
{__NR_sched_setaffinity, "sched_setaffinity"},
@@ -357,14 +358,17 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
357358
{__NR_sendmmsg, "sendmmsg"},
358359
{__NR_sendmsg, "sendmsg"},
359360
{__NR_sendto, "sendto"},
361+
{__NR_set_mempolicy, "set_mempolicy"},
362+
{__NR_set_robust_list, "set_robust_list"},
363+
{__NR_set_thread_area, "set_thread_area"},
364+
{__NR_set_tid_address, "set_tid_address"},
360365
{__NR_setdomainname, "setdomainname"},
361366
{__NR_setfsgid, "setfsgid"},
362367
{__NR_setfsuid, "setfsuid"},
363368
{__NR_setgid, "setgid"},
364369
{__NR_setgroups, "setgroups"},
365370
{__NR_sethostname, "sethostname"},
366371
{__NR_setitimer, "setitimer"},
367-
{__NR_set_mempolicy, "set_mempolicy"},
368372
{__NR_setns, "setns"},
369373
{__NR_setpgid, "setpgid"},
370374
{__NR_setpriority, "setpriority"},
@@ -373,11 +377,8 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
373377
{__NR_setresuid, "setresuid"},
374378
{__NR_setreuid, "setreuid"},
375379
{__NR_setrlimit, "setrlimit"},
376-
{__NR_set_robust_list, "set_robust_list"},
377380
{__NR_setsid, "setsid"},
378381
{__NR_setsockopt, "setsockopt"},
379-
{__NR_set_thread_area, "set_thread_area"},
380-
{__NR_set_tid_address, "set_tid_address"},
381382
{__NR_settimeofday, "settimeofday"},
382383
{__NR_setuid, "setuid"},
383384
{__NR_setxattr, "setxattr"},
@@ -402,7 +403,6 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
402403
{__NR_sync, "sync"},
403404
{__NR_sync_file_range, "sync_file_range"},
404405
{__NR_syncfs, "syncfs"},
405-
{__NR__sysctl, "_sysctl"},
406406
{__NR_sysfs, "sysfs"},
407407
{__NR_sysinfo, "sysinfo"},
408408
{__NR_syslog, "syslog"},
@@ -411,12 +411,12 @@ const std::map<uint32_t, std::string> LINUX_SYSCALLS{
411411
{__NR_time, "time"},
412412
{__NR_timer_create, "timer_create"},
413413
{__NR_timer_delete, "timer_delete"},
414-
{__NR_timerfd_create, "timerfd_create"},
415-
{__NR_timerfd_gettime, "timerfd_gettime"},
416-
{__NR_timerfd_settime, "timerfd_settime"},
417414
{__NR_timer_getoverrun, "timer_getoverrun"},
418415
{__NR_timer_gettime, "timer_gettime"},
419416
{__NR_timer_settime, "timer_settime"},
417+
{__NR_timerfd_create, "timerfd_create"},
418+
{__NR_timerfd_gettime, "timerfd_gettime"},
419+
{__NR_timerfd_settime, "timerfd_settime"},
420420
{__NR_times, "times"},
421421
{__NR_tkill, "tkill"},
422422
{__NR_truncate, "truncate"},
@@ -650,6 +650,7 @@ class SeccompPolicyBuilder
650650
{
651651
allowed_syscalls.insert(__NR_clock_getres); // find the resolution (precision) of the specified clock
652652
allowed_syscalls.insert(__NR_clock_gettime); // retrieve the time of the specified clock
653+
allowed_syscalls.insert(__NR_gettimeofday); // get timeval
653654
}
654655

655656
void AllowGlobalProcessEnvironment()

0 commit comments

Comments
 (0)