Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit e83446f

Browse files
thaJeztahthaJeztah
committed
seccomp: add 64-bit time_t syscalls
Relates to https://patchwork.kernel.org/patch/10756415/ Added to whitelist: - `clock_getres_time64` (equivalent of `clock_getres`, which was whitelisted) - `clock_gettime64` (equivalent of `clock_gettime`, which was whitelisted) - `clock_nanosleep_time64` (equivalent of `clock_nanosleep`, which was whitelisted) - `futex_time64` (equivalent of `futex`, which was whitelisted) - `io_pgetevents_time64` (equivalent of `io_pgetevents`, which was whitelisted) - `mq_timedreceive_time64` (equivalent of `mq_timedreceive`, which was whitelisted) - `mq_timedsend_time64 ` (equivalent of `mq_timedsend`, which was whitelisted) - `ppoll_time64` (equivalent of `ppoll`, which was whitelisted) - `pselect6_time64` (equivalent of `pselect6`, which was whitelisted) - `recvmmsg_time64` (equivalent of `recvmmsg`, which was whitelisted) - `rt_sigtimedwait_time64` (equivalent of `rt_sigtimedwait`, which was whitelisted) - `sched_rr_get_interval_time64` (equivalent of `sched_rr_get_interval`, which was whitelisted) - `semtimedop_time64` (equivalent of `semtimedop`, which was whitelisted) - `timer_gettime64` (equivalent of `timer_gettime`, which was whitelisted) - `timer_settime64` (equivalent of `timer_settime`, which was whitelisted) - `timerfd_gettime64` (equivalent of `timerfd_gettime`, which was whitelisted) - `timerfd_settime64` (equivalent of `timerfd_settime`, which was whitelisted) - `utimensat_time64` (equivalent of `utimensat`, which was whitelisted) Not added to whitelist: - `clock_adjtime64` (equivalent of `clock_adjtime`, which was not whitelisted) - `clock_settime64` (equivalent of `clock_settime`, which was not whitelisted) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 89fabf0f241292e929fbb2fbb794d58d8d697ab5) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 284bbde996c5a4d88c0d77aee67da4350dc181ba Component: engine
1 parent 6aba415 commit e83446f

2 files changed

Lines changed: 42 additions & 6 deletions

File tree

‎components/engine/profiles/seccomp/default.json‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,11 @@
6666
"chown",
6767
"chown32",
6868
"clock_getres",
69+
"clock_getres_time64",
6970
"clock_gettime",
71+
"clock_gettime64",
7072
"clock_nanosleep",
73+
"clock_nanosleep_time64",
7174
"close",
7275
"connect",
7376
"copy_file_range",
@@ -117,6 +120,7 @@
117120
"ftruncate",
118121
"ftruncate64",
119122
"futex",
123+
"futex_time64",
120124
"futimesat",
121125
"getcpu",
122126
"getcwd",
@@ -163,6 +167,7 @@
163167
"io_destroy",
164168
"io_getevents",
165169
"io_pgetevents",
170+
"io_pgetevents_time64",
166171
"ioprio_get",
167172
"ioprio_set",
168173
"io_setup",
@@ -200,7 +205,9 @@
200205
"mq_notify",
201206
"mq_open",
202207
"mq_timedreceive",
208+
"mq_timedreceive_time64",
203209
"mq_timedsend",
210+
"mq_timedsend_time64",
204211
"mq_unlink",
205212
"mremap",
206213
"msgctl",
@@ -221,12 +228,14 @@
221228
"pipe2",
222229
"poll",
223230
"ppoll",
231+
"ppoll_time64",
224232
"prctl",
225233
"pread64",
226234
"preadv",
227235
"preadv2",
228236
"prlimit64",
229237
"pselect6",
238+
"pselect6_time64",
230239
"pwrite64",
231240
"pwritev",
232241
"pwritev2",
@@ -238,6 +247,7 @@
238247
"recv",
239248
"recvfrom",
240249
"recvmmsg",
250+
"recvmmsg_time64",
241251
"recvmsg",
242252
"remap_file_pages",
243253
"removexattr",
@@ -253,6 +263,7 @@
253263
"rt_sigreturn",
254264
"rt_sigsuspend",
255265
"rt_sigtimedwait",
266+
"rt_sigtimedwait_time64",
256267
"rt_tgsigqueueinfo",
257268
"sched_getaffinity",
258269
"sched_getattr",
@@ -261,6 +272,7 @@
261272
"sched_get_priority_min",
262273
"sched_getscheduler",
263274
"sched_rr_get_interval",
275+
"sched_rr_get_interval_time64",
264276
"sched_setaffinity",
265277
"sched_setattr",
266278
"sched_setparam",
@@ -272,6 +284,7 @@
272284
"semget",
273285
"semop",
274286
"semtimedop",
287+
"semtimedop_time64",
275288
"send",
276289
"sendfile",
277290
"sendfile64",
@@ -336,12 +349,16 @@
336349
"time",
337350
"timer_create",
338351
"timer_delete",
339-
"timerfd_create",
340-
"timerfd_gettime",
341-
"timerfd_settime",
342352
"timer_getoverrun",
343353
"timer_gettime",
354+
"timer_gettime64",
344355
"timer_settime",
356+
"timer_settime64",
357+
"timerfd_create",
358+
"timerfd_gettime",
359+
"timerfd_gettime64",
360+
"timerfd_settime",
361+
"timerfd_settime64",
345362
"times",
346363
"tkill",
347364
"truncate",
@@ -353,6 +370,7 @@
353370
"unlinkat",
354371
"utime",
355372
"utimensat",
373+
"utimensat_time64",
356374
"utimes",
357375
"vfork",
358376
"vmsplice",

‎components/engine/profiles/seccomp/seccomp_default.go‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ func DefaultProfile() *types.Seccomp {
5959
"chown",
6060
"chown32",
6161
"clock_getres",
62+
"clock_getres_time64",
6263
"clock_gettime",
64+
"clock_gettime64",
6365
"clock_nanosleep",
66+
"clock_nanosleep_time64",
6467
"close",
6568
"connect",
6669
"copy_file_range",
@@ -110,6 +113,7 @@ func DefaultProfile() *types.Seccomp {
110113
"ftruncate",
111114
"ftruncate64",
112115
"futex",
116+
"futex_time64",
113117
"futimesat",
114118
"getcpu",
115119
"getcwd",
@@ -156,6 +160,7 @@ func DefaultProfile() *types.Seccomp {
156160
"io_destroy",
157161
"io_getevents",
158162
"io_pgetevents",
163+
"io_pgetevents_time64",
159164
"ioprio_get",
160165
"ioprio_set",
161166
"io_setup",
@@ -193,7 +198,9 @@ func DefaultProfile() *types.Seccomp {
193198
"mq_notify",
194199
"mq_open",
195200
"mq_timedreceive",
201+
"mq_timedreceive_time64",
196202
"mq_timedsend",
203+
"mq_timedsend_time64",
197204
"mq_unlink",
198205
"mremap",
199206
"msgctl",
@@ -214,12 +221,14 @@ func DefaultProfile() *types.Seccomp {
214221
"pipe2",
215222
"poll",
216223
"ppoll",
224+
"ppoll_time64",
217225
"prctl",
218226
"pread64",
219227
"preadv",
220228
"preadv2",
221229
"prlimit64",
222230
"pselect6",
231+
"pselect6_time64",
223232
"pwrite64",
224233
"pwritev",
225234
"pwritev2",
@@ -231,6 +240,7 @@ func DefaultProfile() *types.Seccomp {
231240
"recv",
232241
"recvfrom",
233242
"recvmmsg",
243+
"recvmmsg_time64",
234244
"recvmsg",
235245
"remap_file_pages",
236246
"removexattr",
@@ -246,6 +256,7 @@ func DefaultProfile() *types.Seccomp {
246256
"rt_sigreturn",
247257
"rt_sigsuspend",
248258
"rt_sigtimedwait",
259+
"rt_sigtimedwait_time64",
249260
"rt_tgsigqueueinfo",
250261
"sched_getaffinity",
251262
"sched_getattr",
@@ -254,6 +265,7 @@ func DefaultProfile() *types.Seccomp {
254265
"sched_get_priority_min",
255266
"sched_getscheduler",
256267
"sched_rr_get_interval",
268+
"sched_rr_get_interval_time64",
257269
"sched_setaffinity",
258270
"sched_setattr",
259271
"sched_setparam",
@@ -265,6 +277,7 @@ func DefaultProfile() *types.Seccomp {
265277
"semget",
266278
"semop",
267279
"semtimedop",
280+
"semtimedop_time64",
268281
"send",
269282
"sendfile",
270283
"sendfile64",
@@ -329,12 +342,16 @@ func DefaultProfile() *types.Seccomp {
329342
"time",
330343
"timer_create",
331344
"timer_delete",
332-
"timerfd_create",
333-
"timerfd_gettime",
334-
"timerfd_settime",
335345
"timer_getoverrun",
336346
"timer_gettime",
347+
"timer_gettime64",
337348
"timer_settime",
349+
"timer_settime64",
350+
"timerfd_create",
351+
"timerfd_gettime",
352+
"timerfd_gettime64",
353+
"timerfd_settime",
354+
"timerfd_settime64",
338355
"times",
339356
"tkill",
340357
"truncate",
@@ -346,6 +363,7 @@ func DefaultProfile() *types.Seccomp {
346363
"unlinkat",
347364
"utime",
348365
"utimensat",
366+
"utimensat_time64",
349367
"utimes",
350368
"vfork",
351369
"vmsplice",

0 commit comments

Comments
 (0)