aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2016-03-30 12:23:42 +0000
committerAndrea Shepard <andrea@torproject.org>2016-03-30 12:23:42 +0000
commit183d465f0e497cbc5f49c08119dfdf00eb7f8cdd (patch)
tree62d58bd1ebe9138d97ed510b7d71342002c9baf7 /src
parent0b45cab1477d93e3065ca2d35e87483688f16bf6 (diff)
parent725e0c76e3df9d3ea4b861b3ff5279b23def4ef9 (diff)
downloadtor-183d465f0e497cbc5f49c08119dfdf00eb7f8cdd.tar.gz
tor-183d465f0e497cbc5f49c08119dfdf00eb7f8cdd.zip
Merge branch 'bug15221_027' into maint-0.2.7
Diffstat (limited to 'src')
-rw-r--r--src/common/sandbox.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 950a92fbb3..bcbb3ce3fa 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -177,11 +177,20 @@ static int filter_nopar_gen[] = {
SCMP_SYS(mmap),
#endif
SCMP_SYS(munmap),
+#ifdef __NR_prlimit
+ SCMP_SYS(prlimit),
+#endif
+#ifdef __NR_prlimit64
+ SCMP_SYS(prlimit64),
+#endif
SCMP_SYS(read),
SCMP_SYS(rt_sigreturn),
SCMP_SYS(sched_getaffinity),
SCMP_SYS(sendmsg),
SCMP_SYS(set_robust_list),
+#ifdef __NR_setrlimit
+ SCMP_SYS(setrlimit),
+#endif
#ifdef __NR_sigreturn
SCMP_SYS(sigreturn),
#endif