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

Cast our weights down to ints from int64.

Browse Source 
They are capped to be between 0 and weight_scale (10000) by the code
just before the snprintf.
This commit is contained in:
Mike Perry 2010-02-25 11:42:45 -08:00
parent 00f9a35678
commit 50d6960332
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/or/dirvote.c
View File

@ -923,6 +923,11 @@ networkstatus_compute_bw_weights_v9(smartlist_t *chunks, int64_t G, int64_t M,
} }
} }
/* We cast down the weights to 32 bit ints on the assumption that
* weight_scale is ~= 10000. We need to ensure a rogue authority
* doesn't break this assumption to rig our weights */
tor_assert(0 < weight_scale && weight_scale < INT32_MAX);
if (Wgg < 0 || Wgg > weight_scale) { if (Wgg < 0 || Wgg > weight_scale) {
log_warn(LD_DIR, "Bw %s: Wgg="I64_FORMAT"! G="I64_FORMAT log_warn(LD_DIR, "Bw %s: Wgg="I64_FORMAT"! G="I64_FORMAT
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT " M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
@ -984,18 +989,16 @@ networkstatus_compute_bw_weights_v9(smartlist_t *chunks, int64_t G, int64_t M,
* NOTE: This list is sorted. * NOTE: This list is sorted.
*/ */
r = tor_snprintf(buf, sizeof(buf), r = tor_snprintf(buf, sizeof(buf),
"Wbd="I64_FORMAT" Wbe="I64_FORMAT" Wbg="I64_FORMAT" Wbm="I64_FORMAT" " "Wbd=%d Wbe=%d Wbg=%d Wbm=%d "
"Wdb="I64_FORMAT" " "Wdb=%d "
"Web="I64_FORMAT" Wed="I64_FORMAT" Wee="I64_FORMAT" Weg="I64_FORMAT "Web=%d Wed=%d Wee=%d Weg=%d Wem=%d "
" Wem="I64_FORMAT" " "Wgb=%d Wgd=%d Wgg=%d Wgm=%d "
"Wgb="I64_FORMAT" Wgd="I64_FORMAT" Wgg="I64_FORMAT" Wgm="I64_FORMAT" " "Wmb=%d Wmd=%d Wme=%d Wmg=%d Wmm=%d\n",
"Wmb="I64_FORMAT" Wmd="I64_FORMAT" Wme="I64_FORMAT" Wmg="I64_FORMAT (int)Wmd, (int)Wme, (int)Wmg, (int)weight_scale,
" Wmm="I64_FORMAT"\n", (int)weight_scale,
Wmd, Wme, Wmg, weight_scale, (int)weight_scale, (int)Wed, (int)Wee, (int)Wed, (int)Wee,
weight_scale, (int)weight_scale, (int)Wgd, (int)Wgg, (int)Wgg,
weight_scale, Wed, Wee, Wed, Wee, (int)weight_scale, (int)Wmd, (int)Wme, (int)Wmg, (int)weight_scale);
weight_scale, Wgd, Wgg, Wgg,
weight_scale, Wmd, Wme, Wmg, weight_scale);
if (r<0) { if (r<0) {
log_warn(LD_BUG, log_warn(LD_BUG,
"Not enough space in buffer for bandwidth-weights line."); "Not enough space in buffer for bandwidth-weights line.");