September 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Merge branch 'ticket31687_035' into ticket31687_040
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 12 09:51:04 2019 -0400 Merge branch 'ticket31687_035' into ticket31687_040 changes/ticket31687_1 | 4 ++++ changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- src/lib/math/fp.c | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.1] pf: when extracting an IPv6 address, make sure we got an IPv6 address
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent proxy connection, we actually will. But we didn't check that, and so FreeBSD started warning us about a potential NULL pointer dereference. Fixes part of bug 31687; bugfix on 0.2.3.4-alpha when this code was added. --- changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/ticket31687_2 b/changes/ticket31687_2 new file mode 100644 index 000000000..eadc69827 --- /dev/null +++ b/changes/ticket31687_2 @@ -0,0 +1,5 @@ + o Minor bugfixes (FreeBSD, PF-based proxy, IPv6): + - When extracting an IPv6 address from a PF-based proxy, verify + that we are actually configured to receive an IPv6 address, + and log an internal error if not. Fixes part of bug 31687; + bugfix on 0.2.3.4-alpha. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index e4b3455d1..7cc67d7f5 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2547,8 +2547,11 @@ destination_from_pf(entry_connection_t *conn, socks_request_t *req) } else if (proxy_sa->sa_family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)proxy_sa; pnl.af = AF_INET6; - memcpy(&pnl.saddr.v6, tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr), - sizeof(struct in6_addr)); + const struct in6_addr *dest_in6 = + tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr); + if (BUG(!dest_in6)) + return -1; + memcpy(&pnl.saddr.v6, dest_in6, sizeof(struct in6_addr)); pnl.sport = htons(ENTRY_TO_CONN(conn)->port); memcpy(&pnl.daddr.v6, &sin6->sin6_addr, sizeof(struct in6_addr)); pnl.dport = sin6->sin6_port;

1 0

[tor/release-0.4.0] Ticket 31687: fix for tor_isinf() as well
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 34bab120df213970edf32db1f3462ff2585ee098 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 12 09:53:13 2019 -0400 Ticket 31687: fix for tor_isinf() as well tor_isinf() was new in 0.4.0, and also needs to look at the same rules as clamp_double_to_i64() --- src/lib/math/fp.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c index 9d93eaa87..616e4f15c 100644 --- a/src/lib/math/fp.c +++ b/src/lib/math/fp.c @@ -127,16 +127,12 @@ int tor_isinf(double x) { /* Same as above, work around the "double promotion" warnings */ -#if defined(MINGW_ANY) && GCC_VERSION >= 409 -#define PROBLEMATIC_FLOAT_CONVERSION_WARNING +#ifdef PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion) -#endif /* defined(MINGW_ANY) && GCC_VERSION >= 409 */ -#if defined(__clang__) -#if __has_warning("-Wdouble-promotion") -#define PROBLEMATIC_DOUBLE_PROMOTION_WARNING +#endif +#ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING DISABLE_GCC_WARNING(double-promotion) #endif -#endif /* defined(__clang__) */ return isinf(x); #ifdef PROBLEMATIC_DOUBLE_PROMOTION_WARNING ENABLE_GCC_WARNING(double-promotion) @@ -145,4 +141,3 @@ ENABLE_GCC_WARNING(double-promotion) ENABLE_GCC_WARNING(float-conversion) #endif } -

1 0

[tor/release-0.4.1] fp.c: Suppress float-conversion warnings on FreeBSD.
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions of GCC, and a common pattern for defining the floating-point classifier functions. Fixes part of 31687. I'm calling this a bugfux on 31687, when we started suppressing these warnings on Windows. --- changes/ticket31687_1 | 4 ++++ src/lib/math/fp.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket31687_1 b/changes/ticket31687_1 new file mode 100644 index 000000000..2f4d44097 --- /dev/null +++ b/changes/ticket31687_1 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Suppress spurious float-conversion warnings from GCC when calling + floating-point classifier functions on FreeBSD. Fixes part of bug + 31687; bugfix on 0.3.1.5-alpha. diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c index 4419635df..eafad358c 100644 --- a/src/lib/math/fp.c +++ b/src/lib/math/fp.c @@ -62,12 +62,16 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(MINGW_ANY) && GCC_VERSION >= 409 +#if (defined(MINGW_ANY)||defined(__FreeBSD__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. + + FreeBSD's math.h uses an __fp_type_select() macro, which dispatches + based on sizeof -- again, this can generate type warnings from + branches that are not taken. */ #define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit c76907b54d2e49d4771aa079683ad75cd763b24d Merge: ece35992a cec42be57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket31687_1 | 4 ++++ changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- src/lib/math/fp.c | 17 ++++++++--------- 4 files changed, 22 insertions(+), 11 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit cec42be570fcbbfbc5971e0ceba21e8eadd32d21 Merge: ab74c3560 34bab120d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket31687_1 | 4 ++++ changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- src/lib/math/fp.c | 17 ++++++++--------- 4 files changed, 22 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.3.5] fp.c: Suppress float-conversion warnings on FreeBSD.
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions of GCC, and a common pattern for defining the floating-point classifier functions. Fixes part of 31687. I'm calling this a bugfux on 31687, when we started suppressing these warnings on Windows. --- changes/ticket31687_1 | 4 ++++ src/lib/math/fp.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket31687_1 b/changes/ticket31687_1 new file mode 100644 index 000000000..2f4d44097 --- /dev/null +++ b/changes/ticket31687_1 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Suppress spurious float-conversion warnings from GCC when calling + floating-point classifier functions on FreeBSD. Fixes part of bug + 31687; bugfix on 0.3.1.5-alpha. diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c index 4419635df..eafad358c 100644 --- a/src/lib/math/fp.c +++ b/src/lib/math/fp.c @@ -62,12 +62,16 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(MINGW_ANY) && GCC_VERSION >= 409 +#if (defined(MINGW_ANY)||defined(__FreeBSD__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. + + FreeBSD's math.h uses an __fp_type_select() macro, which dispatches + based on sizeof -- again, this can generate type warnings from + branches that are not taken. */ #define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion)

1 0

[tor/maint-0.3.5] pf: when extracting an IPv6 address, make sure we got an IPv6 address
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent proxy connection, we actually will. But we didn't check that, and so FreeBSD started warning us about a potential NULL pointer dereference. Fixes part of bug 31687; bugfix on 0.2.3.4-alpha when this code was added. --- changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/ticket31687_2 b/changes/ticket31687_2 new file mode 100644 index 000000000..eadc69827 --- /dev/null +++ b/changes/ticket31687_2 @@ -0,0 +1,5 @@ + o Minor bugfixes (FreeBSD, PF-based proxy, IPv6): + - When extracting an IPv6 address from a PF-based proxy, verify + that we are actually configured to receive an IPv6 address, + and log an internal error if not. Fixes part of bug 31687; + bugfix on 0.2.3.4-alpha. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index e4b3455d1..7cc67d7f5 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2547,8 +2547,11 @@ destination_from_pf(entry_connection_t *conn, socks_request_t *req) } else if (proxy_sa->sa_family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)proxy_sa; pnl.af = AF_INET6; - memcpy(&pnl.saddr.v6, tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr), - sizeof(struct in6_addr)); + const struct in6_addr *dest_in6 = + tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr); + if (BUG(!dest_in6)) + return -1; + memcpy(&pnl.saddr.v6, dest_in6, sizeof(struct in6_addr)); pnl.sport = htons(ENTRY_TO_CONN(conn)->port); memcpy(&pnl.daddr.v6, &sin6->sin6_addr, sizeof(struct in6_addr)); pnl.dport = sin6->sin6_port;

1 0

[tor/maint-0.4.0] fp.c: Suppress float-conversion warnings on FreeBSD.
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions of GCC, and a common pattern for defining the floating-point classifier functions. Fixes part of 31687. I'm calling this a bugfux on 31687, when we started suppressing these warnings on Windows. --- changes/ticket31687_1 | 4 ++++ src/lib/math/fp.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket31687_1 b/changes/ticket31687_1 new file mode 100644 index 000000000..2f4d44097 --- /dev/null +++ b/changes/ticket31687_1 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Suppress spurious float-conversion warnings from GCC when calling + floating-point classifier functions on FreeBSD. Fixes part of bug + 31687; bugfix on 0.3.1.5-alpha. diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c index 4419635df..eafad358c 100644 --- a/src/lib/math/fp.c +++ b/src/lib/math/fp.c @@ -62,12 +62,16 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(MINGW_ANY) && GCC_VERSION >= 409 +#if (defined(MINGW_ANY)||defined(__FreeBSD__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. + + FreeBSD's math.h uses an __fp_type_select() macro, which dispatches + based on sizeof -- again, this can generate type warnings from + branches that are not taken. */ #define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion)

1 0

[tor/maint-0.4.0] Merge branch 'ticket31687_035' into ticket31687_040
by nickm＠torproject.org 17 Sep '19

17 Sep '19

commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 12 09:51:04 2019 -0400 Merge branch 'ticket31687_035' into ticket31687_040 changes/ticket31687_1 | 4 ++++ changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- src/lib/math/fp.c | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-)

1 0