diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-26 10:29:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-26 10:29:29 -0400 |
| commit | 33606405e3070de6517690b1494f16c04524ce72 (patch) | |
| tree | b199a5622716690986f49b13d9f042ef7125fd53 /src/common/sandbox.c | |
| parent | eacfd2911274a7f6676509fc8173b66bd1264bc2 (diff) | |
| parent | b5a6c03998d42147135385f21bd7b85a02385e0f (diff) | |
| download | tor-33606405e3070de6517690b1494f16c04524ce72.tar.gz tor-33606405e3070de6517690b1494f16c04524ce72.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src/common/sandbox.c')
| -rw-r--r-- | src/common/sandbox.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 37f582048c..3588f60dec 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -259,7 +259,8 @@ static int filter_nopar_gen[] = { SCMP_SYS(recvmsg), SCMP_SYS(recvfrom), SCMP_SYS(sendto), - SCMP_SYS(unlink) + SCMP_SYS(unlink), + SCMP_SYS(poll) }; /* These macros help avoid the error where the number of filters we add on a @@ -1071,25 +1072,6 @@ sb_mremap(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } -/** - * Function responsible for setting up the poll syscall for - * the seccomp filter sandbox. - */ -static int -sb_poll(scmp_filter_ctx ctx, sandbox_cfg_t *filter) -{ - int rc = 0; - (void) filter; - - rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), - SCMP_CMP(1, SCMP_CMP_EQ, 1), - SCMP_CMP(2, SCMP_CMP_EQ, 10)); - if (rc) - return rc; - - return 0; -} - #ifdef __NR_stat64 /** * Function responsible for setting up the stat64 syscall for @@ -1161,7 +1143,6 @@ static sandbox_filter_func_t filter_func[] = { sb_flock, sb_futex, sb_mremap, - sb_poll, #ifdef __NR_stat64 sb_stat64, #endif |