October 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.0] Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2 Merge: fcd5c3144 5bca66be4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:53:45 2017 -0400 Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9 changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.2.9] Clear the address when node_get_prim_orport() returns early
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 5bca66be497f18b94a85ad8eb836fff5a356627d Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 16:45:15 2017 -0400 Clear the address when node_get_prim_orport() returns early Fixes bug 23874; bugfix on 0.2.8.2-alpha. --- changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug23874 b/changes/bug23874 new file mode 100644 index 000000000..bf6620553 --- /dev/null +++ b/changes/bug23874 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory safety): + - Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 070e2e9e0..0e9a65181 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) node_assert_ok(node); tor_assert(ap_out); + /* Clear the address, as a safety precaution if calling functions ignore the + * return value */ + tor_addr_make_null(&ap_out->addr, AF_INET); + ap_out->port = 0; + + /* Check ri first, because rewrite_node_address_for_bridge() updates + * node->ri with the configured bridge address. */ + RETURN_IPV4_AP(node->ri, or_port, ap_out); RETURN_IPV4_AP(node->rs, or_port, ap_out); /* Microdescriptors only have an IPv6 address */

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1 Merge: eac4c374e b1bd1bf19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:55:08 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d Merge: af33fdd7c 9ae4ffc07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:55:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2 Merge: fcd5c3144 5bca66be4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:53:45 2017 -0400 Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9 changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.3.2] Clear the address when node_get_prim_orport() returns early
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 5bca66be497f18b94a85ad8eb836fff5a356627d Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 16:45:15 2017 -0400 Clear the address when node_get_prim_orport() returns early Fixes bug 23874; bugfix on 0.2.8.2-alpha. --- changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug23874 b/changes/bug23874 new file mode 100644 index 000000000..bf6620553 --- /dev/null +++ b/changes/bug23874 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory safety): + - Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 070e2e9e0..0e9a65181 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) node_assert_ok(node); tor_assert(ap_out); + /* Clear the address, as a safety precaution if calling functions ignore the + * return value */ + tor_addr_make_null(&ap_out->addr, AF_INET); + ap_out->port = 0; + + /* Check ri first, because rewrite_node_address_for_bridge() updates + * node->ri with the configured bridge address. */ + RETURN_IPV4_AP(node->ri, or_port, ap_out); RETURN_IPV4_AP(node->rs, or_port, ap_out); /* Microdescriptors only have an IPv6 address */

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1 Merge: eac4c374e b1bd1bf19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:55:08 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit b1d6cf2508e57c98017412446024c9dd6587fe63 Merge: 8b8d50104 f0a6ea0bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:55:48 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Clear the address when node_get_prim_orport() returns early
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 5bca66be497f18b94a85ad8eb836fff5a356627d Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 16:45:15 2017 -0400 Clear the address when node_get_prim_orport() returns early Fixes bug 23874; bugfix on 0.2.8.2-alpha. --- changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug23874 b/changes/bug23874 new file mode 100644 index 000000000..bf6620553 --- /dev/null +++ b/changes/bug23874 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory safety): + - Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 070e2e9e0..0e9a65181 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1031,6 +1031,14 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) node_assert_ok(node); tor_assert(ap_out); + /* Clear the address, as a safety precaution if calling functions ignore the + * return value */ + tor_addr_make_null(&ap_out->addr, AF_INET); + ap_out->port = 0; + + /* Check ri first, because rewrite_node_address_for_bridge() updates + * node->ri with the configured bridge address. */ + RETURN_IPV4_AP(node->ri, or_port, ap_out); RETURN_IPV4_AP(node->rs, or_port, ap_out); /* Microdescriptors only have an IPv6 address */

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit b1d6cf2508e57c98017412446024c9dd6587fe63 Merge: 8b8d50104 f0a6ea0bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:55:48 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0