sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't send DESTROY to circID 0 when circuit_deliver_create_cell fails 

Cypherpunks found this and wrote this patch.

Fix for 12848; fix on (I think) d58d4c0d, which went into 0.0.8pre1
This commit is contained in:
Nick Mathewson 2014-08-12 12:10:57 -04:00
parent 691371b802
commit b32a8b024c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug12848 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (relay):
- Avoid queuing or sending destroy cells for circuit ID zero when
we fail to send a CREATE cell. Fixes bug 12848; bugfix on
0.0.8pre1. Found and fixed by "cypherpunks".

11
src/or/circuitbuild.c
View File

@ -584,18 +584,18 @@ circuit_deliver_create_cell(circuit_t *circ, const create_cell_t *create_cell,
id = get_unique_circ_id_by_chan(circ->n_chan);
if (!id) {
log_warn(LD_CIRC,"failed to get unique circID.");
return -1;
goto error;
}
log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id);
circuit_set_n_circid_chan(circ, id, circ->n_chan);
memset(&cell, 0, sizeof(cell_t));
r = relayed ? create_cell_format_relayed(&cell, create_cell)
: create_cell_format(&cell, create_cell);
if (r < 0) {
log_warn(LD_CIRC,"Couldn't format create cell");
return -1;
goto error;
}
log_debug(LD_CIRC,"Chosen circID %u.", (unsigned)id);
circuit_set_n_circid_chan(circ, id, circ->n_chan);
cell.circ_id = circ->n_circ_id;
append_cell_to_circuit_queue(circ, circ->n_chan, &cell,
@ -619,6 +619,9 @@ circuit_deliver_create_cell(circuit_t *circ, const create_cell_t *create_cell,
}
return 0;
error:
circ->n_chan = NULL;
return -1;
}
/** We've decided to start our reachability testing. If all