Commit 4a8a1f76 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.4' into maint-0.3.5

parents c663716b 50626479

changes/ticket29168

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Major bugfixes (cell scheduler, KIST):

    - Make KIST to always take into account the outbuf length when computing

      what we can actually put in the outbuf. This could lead to the outbuf

      being filled up and thus a possible memory DoS vector. TROVE-2019-001.

      Fixes bug 29168; bugfix on 0.3.2.1-alpha.

src/core/or/scheduler_kist.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ update_socket_info_impl, (socket_table_ent_t *ent)) 
  extra_space =

    clamp_double_to_int64(

                 (ent->cwnd * (int64_t)ent->mss) * sock_buf_size_factor) -

    ent->notsent;

    ent->notsent - (int64_t)channel_outbuf_length((channel_t *) ent->chan);

  if ((tcp_space + extra_space) < 0) {

    /* This means that the "notsent" queue is just too big so we shouldn't put

     * more in the kernel for now. */