tor/ticket29168 at 5fda19030930d0609734191911f971e23aa5359c - tor - Git with a cup of Datura seeds

nihilist/tor

mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00

David Goulet be84ed1a64 kist: Don't write above the highwater outbuf mark

KIST works by computing how much should be allowed to write to the kernel for
a given socket, and then it writes that amount to the outbuf.

The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.

This commit makes it for KIST to take into account the outbuf length when
computing the available space.

Bug found and patch by Rob Jansen.

Closes #29168. TROVE-2019-001.

Signed-off-by: David Goulet <dgoulet@torproject.org>

2019-02-21 10:07:34 -05:00

6 lines

321 B

Plaintext

Raw Blame History

   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.