diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-25 09:22:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-25 09:22:02 -0400 |
| commit | 6abceca1826a018fb51e419fc4eb9721dd501acf (patch) | |
| tree | 0450db6c193a6aaac8c80151f18b05982050c012 | |
| parent | 87134db57cc7cbbd801e5992ce6ca6a71e2ebfc8 (diff) | |
| parent | be2d37ad3cbb5a36fee410f2e36e53b1ee019f48 (diff) | |
| download | tor-6abceca1826a018fb51e419fc4eb9721dd501acf.tar.gz tor-6abceca1826a018fb51e419fc4eb9721dd501acf.zip | |
Merge branch 'memarea_overflow_027_squashed' into maint-0.2.8
| -rw-r--r-- | changes/memarea_overflow | 7 | ||||
| -rw-r--r-- | src/common/memarea.c | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/changes/memarea_overflow b/changes/memarea_overflow new file mode 100644 index 0000000000..8fdc38cc09 --- /dev/null +++ b/changes/memarea_overflow @@ -0,0 +1,7 @@ + o Minor bugfixes (pointer arithmetic): + - Fix a bug in memarea_alloc() that could have resulted in remote heap + write access, if Tor had ever passed an unchecked size to + memarea_alloc(). Fortunately, all the sizes we pass to memarea_alloc() + are pre-checked to be less than 128 kilobytes. Fixes bug 19150; bugfix + on 0.2.1.1-alpha. Bug found by Guido Vranken. + diff --git a/src/common/memarea.c b/src/common/memarea.c index 0a3fd009b0..173ed4e1cb 100644 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@ -83,8 +83,7 @@ typedef struct memarea_chunk_t { struct memarea_chunk_t *next_chunk; size_t mem_size; /**< How much RAM is available in mem, total? */ char *next_mem; /**< Next position in mem to allocate data at. If it's - * greater than or equal to mem+mem_size, this chunk is - * full. */ + * equal to mem+mem_size, this chunk is full. */ #ifdef USE_ALIGNED_ATTRIBUTE /** Actual content of the memory chunk. */ char mem[FLEXIBLE_ARRAY_MEMBER] __attribute__((aligned(MEMAREA_ALIGN))); @@ -205,7 +204,10 @@ memarea_alloc(memarea_t *area, size_t sz) tor_assert(sz < SIZE_T_CEILING); if (sz == 0) sz = 1; - if (chunk->next_mem+sz > chunk->U_MEM+chunk->mem_size) { + tor_assert(chunk->next_mem <= chunk->U_MEM + chunk->mem_size); + const size_t space_remaining = + (chunk->U_MEM + chunk->mem_size) - chunk->next_mem; + if (sz > space_remaining) { if (sz+CHUNK_HEADER_SIZE >= CHUNK_SIZE) { /* This allocation is too big. Stick it in a special chunk, and put * that chunk second in the list. */ |