tor

commit 01404d7c52a7c9b5756a73d662811da70d7a8378
parent a794fb7609a9f68af7c21f4b9dd671a0774d4d4c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 28 Jun 2017 12:25:09 -0400

Merge branch 'maint-0.3.1'

Diffstat:
A
changes/bug22751
 | 
5
+++++
M
src/common/sandbox.c
 | 
10
++++++++--

2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changes/bug22751 b/changes/bug22751
@@ -0,0 +1,5 @@
+  o Major bugfixes (compression):
+    - Fix crash in LZMA module, when the Sandbox is enabled, where
+      liblzma would allocate more than 16 MB of memory.  We solve this
+      by bumping the mprotect() limit in the Sandbox module from 16 MB
+      to 20 MB.  Fixes bug 22751; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
@@ -19,8 +19,14 @@
 #define _LARGEFILE64_SOURCE
 #endif
 
-/** Malloc mprotect limit in bytes. */
-#define MALLOC_MP_LIM (16*1024*1024)
+/** Malloc mprotect limit in bytes.
+ *
+ * 28/06/2017: This value was increased from 16 MB to 20 MB after we introduced
+ * LZMA support in Tor (0.3.1.1-alpha). We limit our LZMA coder to 16 MB, but
+ * liblzma have a small overhead that we need to compensate for to avoid being
+ * killed by the sandbox.
+ */
+#define MALLOC_MP_LIM (20*1024*1024)
 
 #include <stdio.h>
 #include <string.h>