summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-06-15 10:19:46 -0400
committerNick Mathewson <nickm@torproject.org>2015-06-15 10:19:46 -0400
commit130a9c0ac8aa13acf7e59872aa628e1864fc828d (patch)
treecd3745ccba4cb7b2c7ace4ca561fc12b738e27f6 /src/common
parent3c5fe7b8ab4ef228658b06e16a3286f1fda2f800 (diff)
parent59fa0c2d996621af5c6990534fe9a07864882975 (diff)
downloadtor-130a9c0ac8aa13acf7e59872aa628e1864fc828d.tar.gz
tor-130a9c0ac8aa13acf7e59872aa628e1864fc828d.zip
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src/common')
-rw-r--r--src/common/sandbox.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index cdb4521c82..161eab7aad 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -129,7 +129,15 @@ static int filter_nopar_gen[] = {
SCMP_SYS(clone),
SCMP_SYS(epoll_create),
SCMP_SYS(epoll_wait),
+#ifdef HAVE_EVENTFD
SCMP_SYS(eventfd2),
+#endif
+#ifdef HAVE_PIPE2
+ SCMP_SYS(pipe2),
+#endif
+#ifdef HAVE_PIPE
+ SCMP_SYS(pipe),
+#endif
SCMP_SYS(fcntl),
SCMP_SYS(fstat),
#ifdef __NR_fstat64