tor

commit c39c9ce26ba2990177e45a4c7bffaed51d88d280
parent 028733e8b6f36bae420b1e41897401fa3b14ccf8
Author: David Goulet <dgoulet@torproject.org>
Date:   Thu, 12 Sep 2019 13:47:09 -0400

Merge branch 'tor-github/pr/1285'

Diffstat:
A
changes/bug31570
 | 
5
+++++
M
src/lib/malloc/map_anon.c
 | 
15
++++++++++++++-

2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/changes/bug31570 b/changes/bug31570
@@ -0,0 +1,5 @@
+  o Major bugfixes (crash, android):
+    - Tolerate systems (including some Android installations) where madvise
+      and MADV_DONTDUMP are available at build-time, but not at run time.
+      Previously, these systems would notice a failed syscall and abort.
+      Fixes bug 31570; bugfix on 0.4.1.1-alpha.
diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c
@@ -27,6 +27,9 @@
 #include <windows.h>
 #endif
 
+#include <string.h>
+#include <errno.h>
+
 /**
  * Macro to get the high bytes of a size_t, if there are high bytes.
  * Windows needs this; other operating systems define a size_t that does
@@ -108,7 +111,17 @@ static int
 nodump_mem(void *mem, size_t sz)
 {
 #if defined(MADV_DONTDUMP)
-  return madvise(mem, sz, MADV_DONTDUMP);
+  int rv = madvise(mem, sz, MADV_DONTDUMP);
+  if (rv == 0) {
+    return 0;
+  } else if (errno == ENOSYS || errno == EINVAL) {
+    return 0; // syscall not supported, or flag not supported.
+  } else {
+    tor_log_err_sigsafe("Unexpected error from madvise: ",
+                        strerror(errno),
+                        NULL);
+    return -1;
+  }
 #else
   (void) mem;
   (void) sz;