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

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

26 Mar '18

commit c68bfc556c7820ca3f3e01aa1ba0f8487b172fcd Merge: d749f6b5f 33606405e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.3.3' changes/feature25313 | 4 ++++ src/common/sandbox.c | 23 ++--------------------- 2 files changed, 6 insertions(+), 21 deletions(-)

1 0

[tor/release-0.3.1] Add the poll() syscall as permitted by the sandbox
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 070eda5a21f580ee00ed64527ade4343b10e0fb6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 08:22:28 2018 -0400 Add the poll() syscall as permitted by the sandbox Apparently, sometimes getpwnam will call this. Fixes bug 25513. --- changes/feature25313 | 4 ++++ src/common/sandbox.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/feature25313 b/changes/feature25313 new file mode 100644 index 000000000..90f421169 --- /dev/null +++ b/changes/feature25313 @@ -0,0 +1,4 @@ + o Minor features (sandbox): + - Explicitly permit the poll() system call when the Linux seccomp2-based + sandbox is enabled: apparently, some versions of libc use poll() when + calling getpwnam(). Closes ticket 25313. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index b90ae0257..c1b7bfe5e 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -247,7 +247,8 @@ static int filter_nopar_gen[] = { SCMP_SYS(recvmsg), SCMP_SYS(recvfrom), SCMP_SYS(sendto), - SCMP_SYS(unlink) + SCMP_SYS(unlink), + SCMP_SYS(poll) }; /* These macros help avoid the error where the number of filters we add on a

1 0

[tor/release-0.2.9] Remove sb_poll check: all poll() calls are ok.
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 9f93bcd16d70b540c518acee56a440be12072ef7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 08:30:21 2018 -0400 Remove sb_poll check: all poll() calls are ok. --- src/common/sandbox.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index c1b7bfe5e..87fe08e88 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1063,25 +1063,6 @@ sb_mremap(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } -/** - * Function responsible for setting up the poll syscall for - * the seccomp filter sandbox. - */ -static int -sb_poll(scmp_filter_ctx ctx, sandbox_cfg_t *filter) -{ - int rc = 0; - (void) filter; - - rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), - SCMP_CMP(1, SCMP_CMP_EQ, 1), - SCMP_CMP(2, SCMP_CMP_EQ, 10)); - if (rc) - return rc; - - return 0; -} - #ifdef __NR_stat64 /** * Function responsible for setting up the stat64 syscall for @@ -1156,7 +1137,6 @@ static sandbox_filter_func_t filter_func[] = { sb_flock, sb_futex, sb_mremap, - sb_poll, #ifdef __NR_stat64 sb_stat64, #endif

1 0

[tor/release-0.3.1] Remove sb_poll check: all poll() calls are ok.
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 9f93bcd16d70b540c518acee56a440be12072ef7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 08:30:21 2018 -0400 Remove sb_poll check: all poll() calls are ok. --- src/common/sandbox.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index c1b7bfe5e..87fe08e88 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1063,25 +1063,6 @@ sb_mremap(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } -/** - * Function responsible for setting up the poll syscall for - * the seccomp filter sandbox. - */ -static int -sb_poll(scmp_filter_ctx ctx, sandbox_cfg_t *filter) -{ - int rc = 0; - (void) filter; - - rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), - SCMP_CMP(1, SCMP_CMP_EQ, 1), - SCMP_CMP(2, SCMP_CMP_EQ, 10)); - if (rc) - return rc; - - return 0; -} - #ifdef __NR_stat64 /** * Function responsible for setting up the stat64 syscall for @@ -1156,7 +1137,6 @@ static sandbox_filter_func_t filter_func[] = { sb_flock, sb_futex, sb_mremap, - sb_poll, #ifdef __NR_stat64 sb_stat64, #endif

1 0

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

26 Mar '18

commit 068d092749508bae84e6d5fce605d2f40c1bdb80 Merge: 1aa0ae2cc 9f93bcd16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature25313 | 4 ++++ src/common/sandbox.c | 23 ++--------------------- 2 files changed, 6 insertions(+), 21 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 2a0865898552bd5ededf7338761b5d428c7073d1 Merge: 0945235ff 9f93bcd16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/feature25313 | 4 ++++ src/common/sandbox.c | 23 ++--------------------- 2 files changed, 6 insertions(+), 21 deletions(-)

1 0

[tor/release-0.3.2] Remove sb_poll check: all poll() calls are ok.
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 9f93bcd16d70b540c518acee56a440be12072ef7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 08:30:21 2018 -0400 Remove sb_poll check: all poll() calls are ok. --- src/common/sandbox.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index c1b7bfe5e..87fe08e88 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1063,25 +1063,6 @@ sb_mremap(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } -/** - * Function responsible for setting up the poll syscall for - * the seccomp filter sandbox. - */ -static int -sb_poll(scmp_filter_ctx ctx, sandbox_cfg_t *filter) -{ - int rc = 0; - (void) filter; - - rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(poll), - SCMP_CMP(1, SCMP_CMP_EQ, 1), - SCMP_CMP(2, SCMP_CMP_EQ, 10)); - if (rc) - return rc; - - return 0; -} - #ifdef __NR_stat64 /** * Function responsible for setting up the stat64 syscall for @@ -1156,7 +1137,6 @@ static sandbox_filter_func_t filter_func[] = { sb_flock, sb_futex, sb_mremap, - sb_poll, #ifdef __NR_stat64 sb_stat64, #endif

1 0

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

26 Mar '18

commit 068d092749508bae84e6d5fce605d2f40c1bdb80 Merge: 1aa0ae2cc 9f93bcd16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/feature25313 | 4 ++++ src/common/sandbox.c | 23 ++--------------------- 2 files changed, 6 insertions(+), 21 deletions(-)

1 0

[tor/release-0.3.3] Add the poll() syscall as permitted by the sandbox
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit 070eda5a21f580ee00ed64527ade4343b10e0fb6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 08:22:28 2018 -0400 Add the poll() syscall as permitted by the sandbox Apparently, sometimes getpwnam will call this. Fixes bug 25513. --- changes/feature25313 | 4 ++++ src/common/sandbox.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/feature25313 b/changes/feature25313 new file mode 100644 index 000000000..90f421169 --- /dev/null +++ b/changes/feature25313 @@ -0,0 +1,4 @@ + o Minor features (sandbox): + - Explicitly permit the poll() system call when the Linux seccomp2-based + sandbox is enabled: apparently, some versions of libc use poll() when + calling getpwnam(). Closes ticket 25313. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index b90ae0257..c1b7bfe5e 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -247,7 +247,8 @@ static int filter_nopar_gen[] = { SCMP_SYS(recvmsg), SCMP_SYS(recvfrom), SCMP_SYS(sendto), - SCMP_SYS(unlink) + SCMP_SYS(unlink), + SCMP_SYS(poll) }; /* These macros help avoid the error where the number of filters we add on a

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 26 Mar '18

26 Mar '18

commit e9ec63d1ac9ca1fec0f1e3fea87a48ae000ecf02 Merge: 72db4f836 068d09274 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 26 10:29:29 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/feature25313 | 4 ++++ src/common/sandbox.c | 23 ++--------------------- 2 files changed, 6 insertions(+), 21 deletions(-)

1 0