diff options
author | George Kadianakis <desnacked@riseup.net> | 2020-07-01 12:55:03 +0300 |
---|---|---|
committer | George Kadianakis <desnacked@riseup.net> | 2020-07-01 12:55:03 +0300 |
commit | 0d02c053f84cbbca6c373ccea5b2174e6c62e3c4 (patch) | |
tree | 1b47b3bb05498b5a0e666c6db9b41ef087eaa86c | |
parent | 9638c6d7a7c9de5336eab16eb013f97a62c75022 (diff) | |
parent | 1932a84ef523c9408907498c9148915760c90826 (diff) | |
download | tor-0d02c053f84cbbca6c373ccea5b2174e6c62e3c4.tar.gz tor-0d02c053f84cbbca6c373ccea5b2174e6c62e3c4.zip |
Merge branch 'maint-0.4.3' into maint-0.4.4
-rw-r--r-- | changes/ticket33346 | 3 | ||||
-rw-r--r-- | src/lib/sandbox/sandbox.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket33346 b/changes/ticket33346 new file mode 100644 index 0000000000..acbbae5169 --- /dev/null +++ b/changes/ticket33346 @@ -0,0 +1,3 @@ + o Minor features (linux seccomp2 sandbox): + - Permit the unlinkat() syscall, which some Libc implementations + use to implement unlink(). Closes ticket 33346. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 903d48449a..2b4181e7f8 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -279,6 +279,9 @@ static int filter_nopar_gen[] = { SCMP_SYS(recvfrom), SCMP_SYS(sendto), SCMP_SYS(unlink), +#ifdef __NR_unlinkat + SCMP_SYS(unlinkat), +#endif SCMP_SYS(poll) }; |