April 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit e8683bcbb19318fcd9df04464296d6581adc959d Merge: cb813a352 1438c6c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'bug24969_029_v2' into maint-0.2.9
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 9727b4c5d683173888b5a49e8b24c3faa9045521 Merge: d3ff12630 c4be6dfea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:25 2018 -0400 Merge branch 'bug24969_029_v2' into maint-0.2.9 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e Merge: ce8e7427b 9727b4c5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit e8683bcbb19318fcd9df04464296d6581adc959d Merge: cb813a352 1438c6c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Permit the nanosleep system call in the seccomp2 callbox
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit c4be6dfeabc8d42ecb6ccea8ca44d1ff0835071a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 18 10:25:42 2018 -0400 Permit the nanosleep system call in the seccomp2 callbox Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced. --- changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/changes/bug24969 b/changes/bug24969 new file mode 100644 index 000000000..46b2bae6f --- /dev/null +++ b/changes/bug24969 @@ -0,0 +1,3 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - Allow the nanosleep() system call, which glibc uses to implement + sleep() and usleep(). Fixes bug 24969; bugfix on 0.2.5.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 87fe08e88..3d27ea66b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -185,6 +185,9 @@ static int filter_nopar_gen[] = { SCMP_SYS(mmap), #endif SCMP_SYS(munmap), +#ifdef __NR_nanosleep + SCMP_SYS(nanosleep), +#endif #ifdef __NR_prlimit SCMP_SYS(prlimit), #endif

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 5c3639923fb3d7a1bfc7b38248001e67333fa35e Merge: ce8e7427b 9727b4c5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e Merge: f0230ee38 5c3639923 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:23:31 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit e8683bcbb19318fcd9df04464296d6581adc959d Merge: cb813a352 1438c6c71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 5807656f8f0f0d39e712b104d80790570dee87fa Merge: 84ff77689 e8683bcbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24969 | 3 +++ src/common/sandbox.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 1b40e9986bba3667b8dd22af22c2e2f495c1eb6b Merge: c5ffcbb43 e8683bcbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 23 09:24:33 2018 -0400 Merge branch 'maint-0.3.3'

1 0