summaryrefslogtreecommitdiff
path: root/src/common/sandbox.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-16 12:44:47 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-16 12:44:47 -0500
commit7461cd30676da62324271ddd7b7d347eeff40266 (patch)
tree46ef1ebd7aceec689f5cd590f495072a3c7c83c8 /src/common/sandbox.c
parent1b9bb2c847a97a50f519ee12df56b6dcdfe6686c (diff)
downloadtor-7461cd30676da62324271ddd7b7d347eeff40266.tar.gz
tor-7461cd30676da62324271ddd7b7d347eeff40266.zip
Permit kill(pid, 0) in the seccomp2 sandbox.
We don't want to allow general signals to be sent, but there's no problem sending a kill(0) to probe whether a process is there. Fixes bug 24198; bugfix on 0.2.5.1-alpha when the seccomp2 sandbox was introduced.
Diffstat (limited to 'src/common/sandbox.c')
-rw-r--r--src/common/sandbox.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 7f4511db2a..0b862a549c 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1050,6 +1050,19 @@ sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
}
#endif
+static int
+sb_kill(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+{
+ (void) filter;
+#ifdef __NR_kill
+ /* Allow killing anything with signal 0 -- it isn't really a kill. */
+ return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill),
+ SCMP_CMP(1, SCMP_CMP_EQ, 0));
+#else
+ return 0;
+#endif
+}
+
/**
* Array of function pointers responsible for filtering different syscalls at
* a parameter level.
@@ -1088,7 +1101,8 @@ static sandbox_filter_func_t filter_func[] = {
sb_socket,
sb_setsockopt,
sb_getsockopt,
- sb_socketpair
+ sb_socketpair,
+ sb_kill
};
const char *