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

[tor/maint-0.4.3] hs_dos.c: rewrite a comment not to say "fallthrough"
by nickm＠torproject.org 06 May '20

06 May '20

commit 2cd1c0765834087797455301dbc2c941b71036a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:49:57 2020 -0400 hs_dos.c: rewrite a comment not to say "fallthrough" There's nothing wrong with the comment, but the script I'm about to apply wouldn't like it. --- src/feature/hs/hs_dos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/hs/hs_dos.c b/src/feature/hs/hs_dos.c index b64ab0a1c..1f7415a28 100644 --- a/src/feature/hs/hs_dos.c +++ b/src/feature/hs/hs_dos.c @@ -196,7 +196,9 @@ hs_dos_can_send_intro2(or_circuit_t *s_intro_circ) goto allow; } - /* Fallthrough is to disallow since this means the bucket has reached 0. */ + /* If we reach this point, then it means the bucket has reached zero, and + we're going to disallow. */ + disallow: /* Increment stats counter, we are rejecting the INTRO2 cell. */ intro2_rejected_count++;

1 0

[tor/master] Add a fallthrough macro.
by nickm＠torproject.org 06 May '20

06 May '20

commit 6c3c94357c196681ceda773425e18161da8cfdef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 10:24:21 2020 -0400 Add a fallthrough macro. This macro defers to __attribute__((fallthrough)) on GCC (and clang). Previously we had been using GCC's magic /* fallthrough */ comments, but clang very sensibly doesn't accept those. Since not all compiler recognize it, we only define it when our configure script detects that it works. Part of a fix for 34078. --- configure.ac | 16 ++++++++++++++++ src/lib/cc/compat_compiler.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/configure.ac b/configure.ac index bc434ed83..a441162f4 100644 --- a/configure.ac +++ b/configure.ac @@ -356,6 +356,22 @@ if test "$tor_cv_c_c99_designated_init" != "yes"; then AC_MSG_ERROR([Your compiler doesn't support c99 designated initializers. This is required as of Tor 0.2.6.x]) fi +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Werror" +AC_CACHE_CHECK([for __attribute__((fallthrough))], + tor_cv_c_attr_fallthrough, + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([extern int x; void fn(void) ;], + [[ switch (x) { case 1: fn(); __attribute__((fallthrough)); + case 2: fn(); break; } ]])], + [tor_cv_c_attr_fallthrough=yes], + [tor_cv_c_attr_fallthrough=no] )]) +CFLAGS="$saved_CFLAGS" + +if test "$tor_cv_c_attr_fallthrough" == "yes"; then + AC_DEFINE(HAVE_ATTR_FALLTHROUGH, [1], [defined if we have the fallthrough attribute.]) +fi + TORUSER=_tor AC_ARG_WITH(tor-user, AS_HELP_STRING(--with-tor-user=NAME, [specify username for tor daemon]), diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index 3a0f30718..fbe6a38f1 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -50,6 +50,12 @@ #define CHECK_SCANF(formatIdx, firstArg) #endif /* defined(__GNUC__) */ +#if defined(HAVE_ATTR_FALLTHROUGH) +#define FALLTHROUGH __attribute__((fallthrough)) +#else +#define FALLTHROUGH +#endif + /* What GCC do we have? */ #ifdef __GNUC__ #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 06 May '20

06 May '20

commit fecc5fd38d80093a9c189eece4acd41c35cd36c6 Merge: e61867416 d04b708b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest_nss.c | 2 +- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'bug34078_prelim_041' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit 1041306092e978f6b028693e7893470bff1c61f9 Merge: a02e86664 3e42464f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:46:52 2020 -0400 Merge branch 'bug34078_prelim_041' into maint-0.4.1 configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest_nss.c | 3 +-- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 06 May '20

06 May '20

commit 82effefb69defc757ed2f576d40badbd8460f757 Merge: 42dfcd0ae fecc5fd38 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.3' configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest_nss.c | 2 +- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 06 May '20

06 May '20

commit d04b708b4bd47ee8df6796f19b25f558b2b18e91 Merge: bbfc498e2 28f453c47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 configure.ac | 16 ++++++++++++++++ src/core/proto/proto_socks.c | 5 ++++- src/ext/ed25519/donna/ed25519_tor.c | 4 +++- src/feature/dirauth/keypin.c | 2 +- src/feature/relay/dns.c | 2 +- src/lib/cc/compat_compiler.h | 6 ++++++ src/lib/crypt_ops/crypto_digest_nss.c | 3 +-- src/lib/net/address.c | 1 + 8 files changed, 33 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 06 May '20

06 May '20

commit 28f453c4764962394bf0cd3a314b2b60af7ee1b4 Merge: 104130609 78a72f819 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:47:03 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1

1 0

[tor/master] Merge branch 'maint-0.4.3'
by nickm＠torproject.org 06 May '20

06 May '20

commit 42246f8c9aee97d3efb0b437369554a3fa6f6890 Merge: 82effefb6 2cd1c0765 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:50:21 2020 -0400 Merge branch 'maint-0.4.3' src/feature/hs/hs_dos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Replace some "fall through" comments not at the end of a case.
by nickm＠torproject.org 06 May '20

06 May '20

commit 9fe23b8672fdc4da64a99acf55b47193375b9562 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 10:35:36 2020 -0400 Replace some "fall through" comments not at the end of a case. --- src/core/proto/proto_socks.c | 5 ++++- src/feature/relay/dns.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index 8b78ed44c..a6493366e 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -1067,7 +1067,10 @@ parse_socks_client(const uint8_t *data, size_t datalen, log_info(LD_NET, "SOCKS 5 client: need authentication."); *drain_out = -1; return 2; - /* fall through */ + default: + /* This wasn't supposed to be exhaustive; there are other + * authentication methods too. */ + ; } *reason = tor_strdup("server doesn't support any of our available " diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index cc9f4cf49..38395862c 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -546,7 +546,7 @@ send_resolved_cell,(edge_connection_t *conn, uint8_t answer_type, break; } else { answer_type = RESOLVED_TYPE_ERROR; - /* fall through. */ + /* We let this fall through and treat it as an error. */ } /* Falls through. */ case RESOLVED_TYPE_ERROR_TRANSIENT:

1 0

[tor/master] hs_dos.c: rewrite a comment not to say "fallthrough"
by nickm＠torproject.org 06 May '20

06 May '20

commit 2cd1c0765834087797455301dbc2c941b71036a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 6 16:49:57 2020 -0400 hs_dos.c: rewrite a comment not to say "fallthrough" There's nothing wrong with the comment, but the script I'm about to apply wouldn't like it. --- src/feature/hs/hs_dos.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/hs/hs_dos.c b/src/feature/hs/hs_dos.c index b64ab0a1c..1f7415a28 100644 --- a/src/feature/hs/hs_dos.c +++ b/src/feature/hs/hs_dos.c @@ -196,7 +196,9 @@ hs_dos_can_send_intro2(or_circuit_t *s_intro_circ) goto allow; } - /* Fallthrough is to disallow since this means the bucket has reached 0. */ + /* If we reach this point, then it means the bucket has reached zero, and + we're going to disallow. */ + disallow: /* Increment stats counter, we are rejecting the INTRO2 cell. */ intro2_rejected_count++;

1 0