January 2020 - tor-commits - lists.torproject.org

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor <teor(a)torproject.org> Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit c3e300dc9c4b63c88bd1e0add0335cf6662d6ec1 Merge: 792172ffe 41d52e9cd Author: teor <teor(a)torproject.org> Date: Thu Jan 30 07:54:54 2020 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor <teor(a)torproject.org> Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)

1 0

[tor/release-0.4.1] Initialize publish/subscribe code when running as an NT service.
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit 54eec5342d45e9add5b9a8fee0167267c38f63f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 08:45:29 2020 -0500 Initialize publish/subscribe code when running as an NT service. Fixes bug 32778; bugfix on 0.4.1.1-alpha. --- changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++ src/app/main/ntmain.c | 7 +++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/bug32778 b/changes/bug32778 new file mode 100644 index 000000000..ccb610469 --- /dev/null +++ b/changes/bug32778 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows service): + - Initialize publish/subscribe system when running as a windows service. + Fixes bug 32778; bugfix on 0.4.1.1-alpha. diff --git a/src/app/main/main.c b/src/app/main/main.c index 6e325f0b1..f3772f86e 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1236,7 +1236,7 @@ run_tor_main_loop(void) } /** Install the publish/subscribe relationships for all the subsystems. */ -static void +void pubsub_install(void) { pubsub_builder_t *builder = pubsub_builder_new(); @@ -1248,7 +1248,7 @@ pubsub_install(void) /** Connect the mainloop to its publish/subscribe message delivery events if * appropriate, and configure the global channels appropriately. */ -static void +void pubsub_connect(void) { if (get_options()->command == CMD_RUN_TOR) { diff --git a/src/app/main/main.h b/src/app/main/main.h index 9dfaf4b8e..76574a907 100644 --- a/src/app/main/main.h +++ b/src/app/main/main.h @@ -25,4 +25,7 @@ int tor_init(int argc, char **argv); int run_tor_main_loop(void); +void pubsub_install(void); +void pubsub_connect(void); + #endif /* !defined(TOR_MAIN_H) */ diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index f00b71270..c5a812203 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -283,7 +283,9 @@ nt_service_body(int argc, char **argv) return; } + pubsub_install(); r = tor_init(backup_argc, backup_argv); + if (r) { /* Failed to start the Tor service */ r = NT_SERVICE_ERROR_TORINIT_FAILED; @@ -294,6 +296,8 @@ nt_service_body(int argc, char **argv) return; } + pubsub_connect(); + /* Set the service's status to SERVICE_RUNNING and start the main * event loop */ service_status.dwCurrentState = SERVICE_RUNNING; @@ -322,9 +326,12 @@ nt_service_main(void) errmsg = format_win32_error(result); printf("Service error %d : %s\n", (int) result, errmsg); tor_free(errmsg); + + pubsub_install(); if (result == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { if (tor_init(backup_argc, backup_argv)) return; + pubsub_connect(); switch (get_options()->command) { case CMD_RUN_TOR: run_tor_main_loop();

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit 41d52e9cd80bfb318ec7f0969f3889d275012e37 Merge: 19954cffd 0d64bafcf Author: teor <teor(a)torproject.org> Date: Thu Jan 30 07:53:53 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)

1 0

[tor/release-0.4.1] Correct how we use libseccomp
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber <peter(a)arbitrary.ch> Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/changes/bug29819 b/changes/bug29819 new file mode 100644 index 000000000..d37ac83d6 --- /dev/null +++ b/changes/bug29819 @@ -0,0 +1,8 @@ + o Minor bugfixes (linux seccomp sandbox): + - Correct how we use libseccomp. Particularly, stop assuming that + rules are applied in a particular order or that more rules are + processed after the first match. Neither is the case! In libseccomp + <2.4.0 this lead to some rules having no effect. Libseccomp 2.4.0 + changed how rules are generated leading to a different ordering + which in turn lead to a fatal crash during startup. Fixes bug + 29819; bugfix on 0.2.5.1-alpha. Patch by Peter Gerber. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index e2356a172..8f577b066 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -491,24 +491,6 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } } - rc = seccomp_rule_add_1(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(open), - SCMP_CMP_MASKED(1, O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, - O_RDONLY)); - if (rc != 0) { - log_err(LD_BUG,"(Sandbox) failed to add open syscall, received libseccomp " - "error %d", rc); - 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; } @@ -562,23 +544,6 @@ sb_chown(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } -static int -sb__sysctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) -{ - int rc; - (void) filter; - (void) ctx; - - rc = seccomp_rule_add_0(ctx, SCMP_ACT_ERRNO(EPERM), SCMP_SYS(_sysctl)); - if (rc != 0) { - log_err(LD_BUG,"(Sandbox) failed to add _sysctl syscall, " - "received libseccomp error %d", rc); - return rc; - } - - return 0; -} - /** * Function responsible for setting up the rename syscall for * the seccomp filter sandbox. @@ -1141,7 +1106,6 @@ static sandbox_filter_func_t filter_func[] = { sb_chmod, sb_open, sb_openat, - sb__sysctl, sb_rename, #ifdef __NR_fcntl64 sb_fcntl64, @@ -1518,14 +1482,14 @@ install_syscall_filter(sandbox_cfg_t* cfg) int rc = 0; scmp_filter_ctx ctx; - ctx = seccomp_init(SCMP_ACT_TRAP); + ctx = seccomp_init(SCMP_ACT_ERRNO(EPERM)); if (ctx == NULL) { log_err(LD_BUG,"(Sandbox) failed to initialise libseccomp context"); rc = -1; goto end; } - // protectign sandbox parameter strings + // protecting sandbox parameter strings if ((rc = prot_strings(ctx, cfg))) { goto end; }

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit d0d2aba9f32fd6725f84f5d8a91ef6798e3dbb73 Merge: 8e3e8b0a1 65825018c Author: teor <teor(a)torproject.org> Date: Thu Jan 30 07:55:01 2020 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit d211b20fbf80c03818d99e99d68e5ae8a3884295 Merge: 2be3b8275 6b392c333 Author: teor <teor(a)torproject.org> Date: Thu Jan 30 07:55:09 2020 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug29819 | 8 ++++++++ changes/bug32778 | 3 +++ src/app/main/main.c | 4 ++-- src/app/main/main.h | 3 +++ src/app/main/ntmain.c | 7 +++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 6 files changed, 25 insertions(+), 40 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit 65825018c7aed931324dd427bb1e84544a9b2f47 Merge: 026f068bb 41d52e9cd Author: teor <teor(a)torproject.org> Date: Thu Jan 30 07:54:58 2020 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-)

1 0

[tor/release-0.4.2] Correct how we use libseccomp
by teor＠torproject.org 29 Jan '20

29 Jan '20

commit 0d64bafcfedd259fb15b3ee85a7b00a840aec73b Author: Peter Gerber <peter(a)arbitrary.ch> Date: Mon Jun 10 14:56:31 2019 +0200 Correct how we use libseccomp This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1. --- changes/bug29819 | 8 ++++++++ src/lib/sandbox/sandbox.c | 40 ++-------------------------------------- 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/changes/bug29819 b/changes/bug29819 new file mode 100644 index 000000000..d37ac83d6 --- /dev/null +++ b/changes/bug29819 @@ -0,0 +1,8 @@ + o Minor bugfixes (linux seccomp sandbox): + - Correct how we use libseccomp. Particularly, stop assuming that + rules are applied in a particular order or that more rules are + processed after the first match. Neither is the case! In libseccomp + <2.4.0 this lead to some rules having no effect. Libseccomp 2.4.0 + changed how rules are generated leading to a different ordering + which in turn lead to a fatal crash during startup. Fixes bug + 29819; bugfix on 0.2.5.1-alpha. Patch by Peter Gerber. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index e2356a172..8f577b066 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -491,24 +491,6 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } } - rc = seccomp_rule_add_1(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(open), - SCMP_CMP_MASKED(1, O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, - O_RDONLY)); - if (rc != 0) { - log_err(LD_BUG,"(Sandbox) failed to add open syscall, received libseccomp " - "error %d", rc); - 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; } @@ -562,23 +544,6 @@ sb_chown(scmp_filter_ctx ctx, sandbox_cfg_t *filter) return 0; } -static int -sb__sysctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) -{ - int rc; - (void) filter; - (void) ctx; - - rc = seccomp_rule_add_0(ctx, SCMP_ACT_ERRNO(EPERM), SCMP_SYS(_sysctl)); - if (rc != 0) { - log_err(LD_BUG,"(Sandbox) failed to add _sysctl syscall, " - "received libseccomp error %d", rc); - return rc; - } - - return 0; -} - /** * Function responsible for setting up the rename syscall for * the seccomp filter sandbox. @@ -1141,7 +1106,6 @@ static sandbox_filter_func_t filter_func[] = { sb_chmod, sb_open, sb_openat, - sb__sysctl, sb_rename, #ifdef __NR_fcntl64 sb_fcntl64, @@ -1518,14 +1482,14 @@ install_syscall_filter(sandbox_cfg_t* cfg) int rc = 0; scmp_filter_ctx ctx; - ctx = seccomp_init(SCMP_ACT_TRAP); + ctx = seccomp_init(SCMP_ACT_ERRNO(EPERM)); if (ctx == NULL) { log_err(LD_BUG,"(Sandbox) failed to initialise libseccomp context"); rc = -1; goto end; } - // protectign sandbox parameter strings + // protecting sandbox parameter strings if ((rc = prot_strings(ctx, cfg))) { goto end; }

1 0