diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-19 13:50:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-19 13:50:49 -0400 |
| commit | 1c64133cb3b9656fc37c1d8c91e1b4225f889428 (patch) | |
| tree | 8d5d0a6b4d1007664993e6e1d62b5881d3a25857 | |
| parent | cd7d006e0829ac83c1d9e5f04fff9ca239973014 (diff) | |
| parent | 59f29970fa78bec8c01bd5f16edca8c24b8724f5 (diff) | |
| download | tor-1c64133cb3b9656fc37c1d8c91e1b4225f889428.tar.gz tor-1c64133cb3b9656fc37c1d8c91e1b4225f889428.zip | |
Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
| -rw-r--r-- | changes/bug22516 | 5 | ||||
| -rw-r--r-- | src/common/sandbox.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug22516 b/changes/bug22516 new file mode 100644 index 0000000000..f024a3c470 --- /dev/null +++ b/changes/bug22516 @@ -0,0 +1,5 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Permit the fchmod system call, to avoid crashing on startup when + starting with the seccomp2 sandbox and an unexpected set of permissions + on the data directory or its contents. Fixes bug 22516; bugfix on + 0.2.5.4-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 95c9f83b8d..da96ad8248 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -136,6 +136,9 @@ static int filter_nopar_gen[] = { #ifdef HAVE_PIPE SCMP_SYS(pipe), #endif +#ifdef __NR_fchmod + SCMP_SYS(fchmod), +#endif SCMP_SYS(fcntl), SCMP_SYS(fstat), #ifdef __NR_fstat64 |