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

[tor/maint-0.4.4] Merge branch 'ticket34382' into maint-0.4.4
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit 318753f502c07bba415f06be04543a3ceb36ae87 Merge: 523231516 1e98d5661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 23 12:29:39 2020 -0400 Merge branch 'ticket34382' into maint-0.4.4 changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit 65328fd4e7bed3d954f81b5cb5ae61bd6ffe8155 Merge: d3bcbccab 318753f50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 23 12:29:47 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.4] sandbox: Do not require M_SYSCALL.
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit 1e98d56617ff3488b5803fb6acb69bf4a6b6922d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 4 12:08:02 2020 -0400 sandbox: Do not require M_SYSCALL. M_SYSCALL is used to report information about a sandbox violation, but when we don't have a definition for it, it still makes sense to compile. Closes ticket 34382. --- changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/changes/ticket34382 b/changes/ticket34382 new file mode 100644 index 000000000..0bdfe22a5 --- /dev/null +++ b/changes/ticket34382 @@ -0,0 +1,6 @@ + o Minor features (Linux seccomp2 sandbox, compilation): + - Allow Tor to build on platforms where it doesn't know how to + report which syscall had caused the linux seccomp2 sandbox + to fail. This change should make the sandbox code more portable + to less common Linux architectures. + Closes ticket 34382. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index b917912f4..903d48449 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -117,6 +117,10 @@ #endif /* defined(__i386__) || ... */ +#ifdef M_SYSCALL +#define SYSCALL_NAME_DEBUGGING +#endif + /**Determines if at least one sandbox is active.*/ static int sandbox_active = 0; /** Holds the parameter list configuration for the sandbox.*/ @@ -1545,8 +1549,10 @@ install_syscall_filter(sandbox_cfg_t* cfg) return (rc < 0 ? -rc : rc); } +#ifdef SYSCALL_NAME_DEBUGGING #include "lib/sandbox/linux_syscalls.inc" +/** Return a string containing the name of a given syscall (if we know it) */ static const char * get_syscall_name(int syscall_num) { @@ -1564,6 +1570,28 @@ get_syscall_name(int syscall_num) } } +/** Return the syscall number from a ucontext_t that we got in a signal + * handler (if we know how to do that). */ +static int +get_syscall_from_ucontext(const ucontext_t *ctx) +{ + return (int) ctx->uc_mcontext.M_SYSCALL; +} +#else +static const char * +get_syscall_name(int syscall_num) +{ + (void) syscall_num; + return "unknown"; +} +static int +get_syscall_from_ucontext(const ucontext_t *ctx) +{ + (void) ctx; + return -1; +} +#endif + #ifdef USE_BACKTRACE #define MAX_DEPTH 256 static void *syscall_cb_buf[MAX_DEPTH]; @@ -1579,7 +1607,6 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) { ucontext_t *ctx = (ucontext_t *) (void_context); const char *syscall_name; - int syscall; #ifdef USE_BACKTRACE size_t depth; int n_fds, i; @@ -1594,7 +1621,7 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) if (!ctx) return; - syscall = (int) ctx->uc_mcontext.M_SYSCALL; + int syscall = get_syscall_from_ucontext(ctx); #ifdef USE_BACKTRACE depth = backtrace(syscall_cb_buf, MAX_DEPTH);

1 0

[tor/master] sandbox: Do not require M_SYSCALL.
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit 1e98d56617ff3488b5803fb6acb69bf4a6b6922d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 4 12:08:02 2020 -0400 sandbox: Do not require M_SYSCALL. M_SYSCALL is used to report information about a sandbox violation, but when we don't have a definition for it, it still makes sense to compile. Closes ticket 34382. --- changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/changes/ticket34382 b/changes/ticket34382 new file mode 100644 index 000000000..0bdfe22a5 --- /dev/null +++ b/changes/ticket34382 @@ -0,0 +1,6 @@ + o Minor features (Linux seccomp2 sandbox, compilation): + - Allow Tor to build on platforms where it doesn't know how to + report which syscall had caused the linux seccomp2 sandbox + to fail. This change should make the sandbox code more portable + to less common Linux architectures. + Closes ticket 34382. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index b917912f4..903d48449 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -117,6 +117,10 @@ #endif /* defined(__i386__) || ... */ +#ifdef M_SYSCALL +#define SYSCALL_NAME_DEBUGGING +#endif + /**Determines if at least one sandbox is active.*/ static int sandbox_active = 0; /** Holds the parameter list configuration for the sandbox.*/ @@ -1545,8 +1549,10 @@ install_syscall_filter(sandbox_cfg_t* cfg) return (rc < 0 ? -rc : rc); } +#ifdef SYSCALL_NAME_DEBUGGING #include "lib/sandbox/linux_syscalls.inc" +/** Return a string containing the name of a given syscall (if we know it) */ static const char * get_syscall_name(int syscall_num) { @@ -1564,6 +1570,28 @@ get_syscall_name(int syscall_num) } } +/** Return the syscall number from a ucontext_t that we got in a signal + * handler (if we know how to do that). */ +static int +get_syscall_from_ucontext(const ucontext_t *ctx) +{ + return (int) ctx->uc_mcontext.M_SYSCALL; +} +#else +static const char * +get_syscall_name(int syscall_num) +{ + (void) syscall_num; + return "unknown"; +} +static int +get_syscall_from_ucontext(const ucontext_t *ctx) +{ + (void) ctx; + return -1; +} +#endif + #ifdef USE_BACKTRACE #define MAX_DEPTH 256 static void *syscall_cb_buf[MAX_DEPTH]; @@ -1579,7 +1607,6 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) { ucontext_t *ctx = (ucontext_t *) (void_context); const char *syscall_name; - int syscall; #ifdef USE_BACKTRACE size_t depth; int n_fds, i; @@ -1594,7 +1621,7 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) if (!ctx) return; - syscall = (int) ctx->uc_mcontext.M_SYSCALL; + int syscall = get_syscall_from_ucontext(ctx); #ifdef USE_BACKTRACE depth = backtrace(syscall_cb_buf, MAX_DEPTH);

1 0

[tor/master] Merge branch 'ticket34382' into maint-0.4.4
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit 318753f502c07bba415f06be04543a3ceb36ae87 Merge: 523231516 1e98d5661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 23 12:29:39 2020 -0400 Merge branch 'ticket34382' into maint-0.4.4 changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.4] sandbox: Do not require M_SYSCALL.
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit 1e98d56617ff3488b5803fb6acb69bf4a6b6922d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 4 12:08:02 2020 -0400 sandbox: Do not require M_SYSCALL. M_SYSCALL is used to report information about a sandbox violation, but when we don't have a definition for it, it still makes sense to compile. Closes ticket 34382. --- changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/changes/ticket34382 b/changes/ticket34382 new file mode 100644 index 000000000..0bdfe22a5 --- /dev/null +++ b/changes/ticket34382 @@ -0,0 +1,6 @@ + o Minor features (Linux seccomp2 sandbox, compilation): + - Allow Tor to build on platforms where it doesn't know how to + report which syscall had caused the linux seccomp2 sandbox + to fail. This change should make the sandbox code more portable + to less common Linux architectures. + Closes ticket 34382. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index b917912f4..903d48449 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -117,6 +117,10 @@ #endif /* defined(__i386__) || ... */ +#ifdef M_SYSCALL +#define SYSCALL_NAME_DEBUGGING +#endif + /**Determines if at least one sandbox is active.*/ static int sandbox_active = 0; /** Holds the parameter list configuration for the sandbox.*/ @@ -1545,8 +1549,10 @@ install_syscall_filter(sandbox_cfg_t* cfg) return (rc < 0 ? -rc : rc); } +#ifdef SYSCALL_NAME_DEBUGGING #include "lib/sandbox/linux_syscalls.inc" +/** Return a string containing the name of a given syscall (if we know it) */ static const char * get_syscall_name(int syscall_num) { @@ -1564,6 +1570,28 @@ get_syscall_name(int syscall_num) } } +/** Return the syscall number from a ucontext_t that we got in a signal + * handler (if we know how to do that). */ +static int +get_syscall_from_ucontext(const ucontext_t *ctx) +{ + return (int) ctx->uc_mcontext.M_SYSCALL; +} +#else +static const char * +get_syscall_name(int syscall_num) +{ + (void) syscall_num; + return "unknown"; +} +static int +get_syscall_from_ucontext(const ucontext_t *ctx) +{ + (void) ctx; + return -1; +} +#endif + #ifdef USE_BACKTRACE #define MAX_DEPTH 256 static void *syscall_cb_buf[MAX_DEPTH]; @@ -1579,7 +1607,6 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) { ucontext_t *ctx = (ucontext_t *) (void_context); const char *syscall_name; - int syscall; #ifdef USE_BACKTRACE size_t depth; int n_fds, i; @@ -1594,7 +1621,7 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) if (!ctx) return; - syscall = (int) ctx->uc_mcontext.M_SYSCALL; + int syscall = get_syscall_from_ucontext(ctx); #ifdef USE_BACKTRACE depth = backtrace(syscall_cb_buf, MAX_DEPTH);

1 0

[tor/release-0.4.4] Merge branch 'ticket34382' into maint-0.4.4
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit 318753f502c07bba415f06be04543a3ceb36ae87 Merge: 523231516 1e98d5661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 23 12:29:39 2020 -0400 Merge branch 'ticket34382' into maint-0.4.4 changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit c104a39a4010a46cba26e7ece679a9e24e49b33e Merge: 107d70360 318753f50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 23 12:29:47 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket34382 | 6 ++++++ src/lib/sandbox/sandbox.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-)

1 0

[tpo/master] privchat - highlight date and time
by antonela＠torproject.org 23 Jun '20

23 Jun '20

commit bfb89e02f213d6566a58e00f2c13ae693ed54dbf Author: Antonela <hola(a)antonela.me> Date: Tue Jun 23 13:26:38 2020 -0300 privchat - highlight date and time --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index e705435c..e6c58f00 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -27,7 +27,7 @@ {{ _('Chapter #1 - Online Privacy in 2020: Activism & COVID-19') }} <a class="btn btn-small bg-primary text-light ml-4 mb-3" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"> {{ _("Save the date") }} </a> <div> - June 23th ∙ 1400 EDT ∙ 1800 UTC ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank">@torproject YouTube channel</a> + June 23th ∙ 1400 EDT ∙ 1800 UTC ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank"> @torproject YouTube channel</a> </div> <div>

1 0

[snowflake-mobile/master] Changed int to long in SID, changed radix 64 to 36
by cohosh＠torproject.org 23 Jun '20

23 Jun '20

commit 7e391ac08d261601c4490e8786951ba5d82b1f74 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jun 23 09:47:55 2020 +0530 Changed int to long in SID, changed radix 64 to 36 --- app/src/main/java/org/torproject/snowflake/SIDHelper.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/SIDHelper.java b/app/src/main/java/org/torproject/snowflake/SIDHelper.java index 1d6cb51..4c903b6 100644 --- a/app/src/main/java/org/torproject/snowflake/SIDHelper.java +++ b/app/src/main/java/org/torproject/snowflake/SIDHelper.java @@ -1,7 +1,5 @@ package org.torproject.snowflake; -import android.util.Log; - import org.torproject.snowflake.exceptions.EmptySIDException; import java.util.Random; @@ -30,7 +28,7 @@ public class SIDHelper { * @return generated sid. */ public String generateSid() { - sid = Integer.toString(new Random().nextInt(), 64).substring(2); + sid = Long.toString(Math.abs(new Random().nextLong()), 36); return sid; }

1 0