Merge remote-tracking branch 'tor-gitlab/mr/433' into main

This commit is contained in:
Alexander Færøy 2021-10-14 13:01:41 +00:00
commit c81901fd39
2 changed files with 8 additions and 4 deletions

3
changes/bug40465 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Fix compilation error when __NR_time is not defined. Fixes bug
40465; bugfix on 0.2.5.5-alpha. Patch by Daniel Pinto.

View File

@ -346,6 +346,7 @@ sb_rt_sigaction(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
return rc;
}
#ifdef __NR_time
/**
* Function responsible for setting up the time syscall for
* the seccomp filter sandbox.
@ -354,13 +355,11 @@ static int
sb_time(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
{
(void) filter;
#ifdef __NR_time
return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(time),
SCMP_CMP(0, SCMP_CMP_EQ, 0));
#else
return 0;
#endif /* defined(__NR_time) */
}
#endif /* defined(__NR_time) */
/**
* Function responsible for setting up the accept4 syscall for
@ -1264,7 +1263,9 @@ sb_kill(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
static sandbox_filter_func_t filter_func[] = {
sb_rt_sigaction,
sb_rt_sigprocmask,
#ifdef __NR_time
sb_time,
#endif
sb_accept4,
#ifdef __NR_mmap2
sb_mmap2,