nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug21372_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2017-02-03 10:35:23 -05:00
commit bc9121d5c9
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug21372 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (client):
- Always recover from failures in extend_info_from_node(),
in an attempt to prevent any recurrence of bug 21242.
Fixes bug 21372; bugfix on 0.2.3.1-alpha.

5
src/or/circuitbuild.c
View File

@ -2110,7 +2110,8 @@ onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei)
return -1; return -1;
} }
exit_ei = extend_info_from_node(node, 0); exit_ei = extend_info_from_node(node, 0);
tor_assert(exit_ei); if (BUG(exit_ei == NULL))
return -1;
} }
state->chosen_exit = exit_ei; state->chosen_exit = exit_ei;
return 0; return 0;
@ -2376,7 +2377,7 @@ onion_extend_cpath(origin_circuit_t *circ)
choose_good_middle_server(purpose, state, circ->cpath, cur_len); choose_good_middle_server(purpose, state, circ->cpath, cur_len);
if (r) { if (r) {
info = extend_info_from_node(r, 0); info = extend_info_from_node(r, 0);
tor_assert(info); tor_assert_nonfatal(info);
} }
} }

7
src/or/control.c
View File

@ -3377,7 +3377,8 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len,
SMARTLIST_FOREACH(nodes, const node_t *, node, SMARTLIST_FOREACH(nodes, const node_t *, node,
{ {
extend_info_t *info = extend_info_from_node(node, first_node); extend_info_t *info = extend_info_from_node(node, first_node);
if (first_node && !info) { if (!info) {
tor_assert_nonfatal(first_node);
log_warn(LD_CONTROL, log_warn(LD_CONTROL,
"controller tried to connect to a node that doesn't have any " "controller tried to connect to a node that doesn't have any "
"addresses that are allowed by the firewall configuration; " "addresses that are allowed by the firewall configuration; "
@ -3385,10 +3386,6 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len,
circuit_mark_for_close(TO_CIRCUIT(circ), -END_CIRC_REASON_CONNECTFAILED); circuit_mark_for_close(TO_CIRCUIT(circ), -END_CIRC_REASON_CONNECTFAILED);
connection_write_str_to_buf("551 Couldn't start circuit\r\n", conn); connection_write_str_to_buf("551 Couldn't start circuit\r\n", conn);
goto done; goto done;
} else {
/* True, since node_has_descriptor(node) == true and we are extending
* to the node's primary address */
tor_assert(info);
} }
circuit_append_new_exit(circ, info); circuit_append_new_exit(circ, info);
extend_info_free(info); extend_info_free(info);

3
src/or/rendservice.c
View File

@ -4162,6 +4162,9 @@ rend_consider_services_intro_points(void)
* even if we are a single onion service and intend to connect to it * even if we are a single onion service and intend to connect to it
* directly ourselves. */ * directly ourselves. */
intro->extend_info = extend_info_from_node(node, 0); intro->extend_info = extend_info_from_node(node, 0);
if (BUG(intro->extend_info == NULL)) {
break;
}
intro->intro_key = crypto_pk_new(); intro->intro_key = crypto_pk_new();
const int fail = crypto_pk_generate_key(intro->intro_key); const int fail = crypto_pk_generate_key(intro->intro_key);
tor_assert(!fail); tor_assert(!fail);