summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-03-04 12:18:10 +0100
committerNick Mathewson <nickm@torproject.org>2015-03-04 12:18:10 +0100
commitd5b2cbea106e020436d577e42672d281400558dd (patch)
tree5c7012197bd7e8e18ea1be01b6d43d842ab8656a
parent51e36026e5b04384bf3311354ef0cd5a5cbf2d59 (diff)
downloadtor-d5b2cbea106e020436d577e42672d281400558dd.tar.gz
tor-d5b2cbea106e020436d577e42672d281400558dd.zip
Add wait4 to the seccomp2 sandbox allowable syscall list
fixes bug 15088. patch from sanic.
-rw-r--r--changes/bug150884
-rw-r--r--src/common/sandbox.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug15088 b/changes/bug15088
new file mode 100644
index 0000000000..95878bdb39
--- /dev/null
+++ b/changes/bug15088
@@ -0,0 +1,4 @@
+ o Minor bugfixes (Linux seccomp2 sandbox):
+ - Upon receiving sighup, do not crash during attempts to call
+ wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from
+ "sanic".
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index dbbaa59d7c..e43b64b913 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -164,6 +164,7 @@ static int filter_nopar_gen[] = {
#endif
SCMP_SYS(stat),
SCMP_SYS(uname),
+ SCMP_SYS(wait4),
SCMP_SYS(write),
SCMP_SYS(writev),
SCMP_SYS(exit_group),