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

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 8939eaf479bc123e774421c9de6dfc3c864e0326 Merge: eccef6ba6 848ba26c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket24315 | 3 +++ configure.ac | 2 ++ src/common/sandbox.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 8939eaf479bc123e774421c9de6dfc3c864e0326 Merge: eccef6ba6 848ba26c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket24315 | 3 +++ configure.ac | 2 ++ src/common/sandbox.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'ticket24315_029' into maint-0.2.9
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 848ba26c188c43cb97a22d5911fceb3714a97272 Merge: 5dc785cee 80bf27040 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:07:37 2018 -0500 Merge branch 'ticket24315_029' into maint-0.2.9 changes/ticket24315 | 3 +++ configure.ac | 2 ++ src/common/sandbox.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit a7f5ece2b9e64447c25e1c52bba48a1187c03fd0 Merge: bdc29eaa7 67043d957 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.3.2'

1 0

[tor/release-0.2.9] Make our seccomp2 sandbox handle Glibc 2.26
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit d2d6a1b082fa0eac8b6478889a0c28bf05e48073 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 13:53:48 2017 -0500 Make our seccomp2 sandbox handle Glibc 2.26 There are three changes here: * We need to allow epoll_pwait. * We need to allow PF_NETLINK sockets to be opened with SOCK_CLOEXEC. * We need to use openat() instead of open(). Note that this fix is not complete, since the openat() change is turned off. The next commit will make the openat() change happen when we're running glibc 2.26 or later. Fix for 24315. --- src/common/sandbox.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 7f4511db2..417c1e305 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -127,6 +127,9 @@ static int filter_nopar_gen[] = { SCMP_SYS(clone), SCMP_SYS(epoll_create), SCMP_SYS(epoll_wait), +#ifdef __NR_epoll_pwait + SCMP_SYS(epoll_pwait), +#endif #ifdef HAVE_EVENTFD SCMP_SYS(eventfd2), #endif @@ -421,6 +424,21 @@ sb_mmap2(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #endif +/** Allow a single file to be opened. If <b>use_openat</b> is true, + * we're using a libc that remaps all the opens into openats. */ +static int +allow_file_open(scmp_filter_ctx ctx, int use_openat, const char *file) +{ + if (use_openat) { + return seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat), + SCMP_CMP_STR(0, SCMP_CMP_EQ, AT_FDCWD), + SCMP_CMP_STR(1, SCMP_CMP_EQ, file)); + } else { + return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), + SCMP_CMP_STR(0, SCMP_CMP_EQ, file)); + } +} + /** * Function responsible for setting up the open syscall for * the seccomp filter sandbox. @@ -437,8 +455,7 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (param != NULL && param->prot == 1 && param->syscall == SCMP_SYS(open)) { - rc = seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open), - SCMP_CMP_STR(0, SCMP_CMP_EQ, param->value)); + rc = allow_file_open(ctx, 0 /* XXXX */, param->value); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received " "libseccomp error %d", rc); @@ -456,6 +473,15 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return rc; } + rc = seccomp_rule_add_1(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(openat), + SCMP_CMP_MASKED(2, O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, + O_RDONLY)); + if (rc != 0) { + log_err(LD_BUG,"(Sandbox) failed to add openat syscall, received " + "libseccomp error %d", rc); + return rc; + } + return 0; } @@ -645,7 +671,7 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter) rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(socket), SCMP_CMP(0, SCMP_CMP_EQ, PF_NETLINK), - SCMP_CMP(1, SCMP_CMP_EQ, SOCK_RAW), + SCMP_CMP_MASKED(1, SOCK_CLOEXEC, SOCK_RAW), SCMP_CMP(2, SCMP_CMP_EQ, 0)); if (rc) return rc; @@ -1616,7 +1642,8 @@ add_param_filter(scmp_filter_ctx ctx, sandbox_cfg_t* cfg) // function pointer for (i = 0; i < ARRAY_LENGTH(filter_func); i++) { - if ((filter_func[i])(ctx, cfg)) { + rc = filter_func[i](ctx, cfg); + if (rc) { log_err(LD_BUG,"(Sandbox) failed to add syscall %d, received libseccomp " "error %d", i, rc); return rc;

1 0

[tor/maint-0.3.2] Merge branch 'ticket24315_029' into maint-0.2.9
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 848ba26c188c43cb97a22d5911fceb3714a97272 Merge: 5dc785cee 80bf27040 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:07:37 2018 -0500 Merge branch 'ticket24315_029' into maint-0.2.9 changes/ticket24315 | 3 +++ configure.ac | 2 ++ src/common/sandbox.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 8939eaf479bc123e774421c9de6dfc3c864e0326 Merge: eccef6ba6 848ba26c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket24315 | 3 +++ configure.ac | 2 ++ src/common/sandbox.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 72 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.9] Add a changes file.
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 80bf270404a52c634a14f6aad594dec4e9ce1e12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 14:07:58 2017 -0500 Add a changes file. --- changes/ticket24315 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket24315 b/changes/ticket24315 new file mode 100644 index 000000000..df34dbf41 --- /dev/null +++ b/changes/ticket24315 @@ -0,0 +1,3 @@ + o Major features (linux seccomp2 sandbox): + - Update the sandbox rules so that they should now work correctly with + Glibc 2.26. Closes ticket 24315.

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 67043d957f2f3cc107c5e0cb3f5c2caa35639506 Merge: 684d57fe8 8939eaf47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 67043d957f2f3cc107c5e0cb3f5c2caa35639506 Merge: 684d57fe8 8939eaf47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:09:35 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0