Merge branch 'maint-0.3.1'

This commit is contained in:
Nick Mathewson 2017-06-19 13:52:19 -04:00
commit 32948ebc54
2 changed files with 8 additions and 0 deletions

5
changes/bug22516 Normal file
View File

@ -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.

View File

@ -135,6 +135,9 @@ static int filter_nopar_gen[] = {
#endif #endif
#ifdef HAVE_PIPE #ifdef HAVE_PIPE
SCMP_SYS(pipe), SCMP_SYS(pipe),
#endif
#ifdef __NR_fchmod
SCMP_SYS(fchmod),
#endif #endif
SCMP_SYS(fcntl), SCMP_SYS(fcntl),
SCMP_SYS(fstat), SCMP_SYS(fstat),