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

Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9

Browse Source
This commit is contained in:
teor 2019-08-10 07:21:31 +10:00
commit e0f9a8222b
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug30041 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (hardening):
- Verify in more places that we are not about to create a buffer
with more than INT_MAX bytes, to avoid possible OOB access in the event
of bugs. Fixes bug 30041; bugfix on 0.2.0.16. Found and fixed by
Tobias Stoeckmann.

4
src/or/buffers.c
View File

@ -1034,6 +1034,7 @@ buf_find_pos_of_char(char ch, buf_pos_t *out)
static inline int static inline int
buf_pos_inc(buf_pos_t *pos) buf_pos_inc(buf_pos_t *pos)
{ {
tor_assert(pos->pos < INT_MAX - 1);
++pos->pos; ++pos->pos;
if (pos->pos == (off_t)pos->chunk->datalen) { if (pos->pos == (off_t)pos->chunk->datalen) {
if (!pos->chunk->next) if (!pos->chunk->next)
@ -1925,6 +1926,7 @@ buf_find_offset_of_char(buf_t *buf, char ch)
{ {
chunk_t *chunk; chunk_t *chunk;
off_t offset = 0; off_t offset = 0;
tor_assert(buf->datalen < INT_MAX);
for (chunk = buf->head; chunk; chunk = chunk->next) { for (chunk = buf->head; chunk; chunk = chunk->next) {
char *cp = memchr(chunk->data, ch, chunk->datalen); char *cp = memchr(chunk->data, ch, chunk->datalen);
if (cp) if (cp)
@ -2044,6 +2046,7 @@ assert_buf_ok(buf_t *buf)
for (ch = buf->head; ch; ch = ch->next) { for (ch = buf->head; ch; ch = ch->next) {
total += ch->datalen; total += ch->datalen;
tor_assert(ch->datalen <= ch->memlen); tor_assert(ch->datalen <= ch->memlen);
tor_assert(ch->datalen < INT_MAX);
tor_assert(ch->data >= &ch->mem[0]); tor_assert(ch->data >= &ch->mem[0]);
tor_assert(ch->data <= &ch->mem[0]+ch->memlen); tor_assert(ch->data <= &ch->mem[0]+ch->memlen);
if (ch->data == &ch->mem[0]+ch->memlen) { if (ch->data == &ch->mem[0]+ch->memlen) {
@ -2060,4 +2063,3 @@ assert_buf_ok(buf_t *buf)
tor_assert(buf->datalen == total); tor_assert(buf->datalen == total);
} }
} }

4
src/or/connection.c
View File

@ -3581,6 +3581,10 @@ connection_read_to_buf(connection_t *conn, ssize_t *max_to_read,
if (conn->linked_conn) { if (conn->linked_conn) {
result = move_buf_to_buf(conn->inbuf, conn->linked_conn->outbuf, result = move_buf_to_buf(conn->inbuf, conn->linked_conn->outbuf,
&conn->linked_conn->outbuf_flushlen); &conn->linked_conn->outbuf_flushlen);
if (BUG(result<0)) {
log_warn(LD_BUG, "reading from linked connection buffer failed.");
return -1;
}
} else { } else {
result = 0; result = 0;
} }