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

Always check the retval of circpad_machine_current_state().

Browse Source
This commit is contained in:
George Kadianakis 2019-06-29 19:46:43 +03:00
parent 0e4753e579
commit 98c1262b2a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug31024 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (circuitpadding):
- Add two NULL checks in unreachable places to silence Coverity (CID 144729
and 1447291) and better future proof ourselves. Fixes bug 31024; bugfix
on 0.4.1.1-alpha.

6
src/core/or/circuitpadding.c
View File

@ -450,6 +450,9 @@ circpad_is_token_removal_supported(circpad_machine_runtime_t *mi)
/* Machines that do want token removal are less sensitive to performance. /* Machines that do want token removal are less sensitive to performance.
* Let's spend some time to check that our state is consistent and sane */ * Let's spend some time to check that our state is consistent and sane */
const circpad_state_t *state = circpad_machine_current_state(mi); const circpad_state_t *state = circpad_machine_current_state(mi);
if (BUG(!state)) {
return 1;
}
tor_assert_nonfatal(state->token_removal != CIRCPAD_TOKEN_REMOVAL_NONE); tor_assert_nonfatal(state->token_removal != CIRCPAD_TOKEN_REMOVAL_NONE);
tor_assert_nonfatal(state->histogram_len == mi->histogram_len); tor_assert_nonfatal(state->histogram_len == mi->histogram_len);
tor_assert_nonfatal(mi->histogram_len != 0); tor_assert_nonfatal(mi->histogram_len != 0);
@ -1667,6 +1670,9 @@ circpad_estimate_circ_rtt_on_received(circuit_t *circ,
} }
} else { } else {
const circpad_state_t *state = circpad_machine_current_state(mi); const circpad_state_t *state = circpad_machine_current_state(mi);
if (BUG(!state)) {
return;
}
/* Since monotime is unpredictably expensive, only update this field /* Since monotime is unpredictably expensive, only update this field
* if rtt estimates are needed. Otherwise, stop the rtt update. */ * if rtt estimates are needed. Otherwise, stop the rtt update. */