From 9cf8637fab8cf3fe8aba5660015bbe7177805807 Mon Sep 17 00:00:00 2001
From: van Hauser <vh@thc.org>
Date: Tue, 11 Aug 2020 03:37:02 +0200
Subject: [PATCH] break up llvm rt afl init

---
 llvm_mode/afl-llvm-rt.o.c | 23 +++++++++++++++++------
 src/afl-fuzz.c            |  2 +-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/llvm_mode/afl-llvm-rt.o.c b/llvm_mode/afl-llvm-rt.o.c
index 02dd8dc8..32903d2f 100644
--- a/llvm_mode/afl-llvm-rt.o.c
+++ b/llvm_mode/afl-llvm-rt.o.c
@@ -35,6 +35,8 @@
 #include <string.h>
 #include <assert.h>
 #include <stdint.h>
+#include <stddef.h>
+#include <limits.h>
 #include <errno.h>
 
 #include <sys/mman.h>
@@ -848,7 +850,6 @@ void __afl_manual_init(void) {
 
   if (!init_done) {
 
-    __afl_map_shm();
     __afl_start_forkserver();
     init_done = 1;
 
@@ -856,17 +857,27 @@ void __afl_manual_init(void) {
 
 }
 
-/* Proper initialization routine. */
+/* Initialization of the forkserver - latest possible */
 
-__attribute__((constructor(CONST_PRIO))) void __afl_auto_init(void) {
+__attribute__((constructor())) void __afl_auto_init(void) {
+
+  if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return;
+
+  if (getenv(DEFER_ENV_VAR)) return;
+
+  __afl_manual_init();
+
+}
+
+/* Initialization of the shmem - earliest possible because of LTO fixed mem. */
+
+__attribute__((constructor(0))) void __afl_auto_early(void) {
 
   if (getenv("AFL_DISABLE_LLVM_INSTRUMENTATION")) return;
 
   is_persistent = !!getenv(PERSIST_ENV_VAR);
 
-  if (getenv(DEFER_ENV_VAR)) return;
-
-  __afl_manual_init();
+    __afl_map_shm();
 
 }
 
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index 783da6e0..fc9cbb6c 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -1305,7 +1305,7 @@ int main(int argc, char **argv_orig, char **envp) {
 
     OKF("Taint forkserver successfully started");
 
-    const rlim_t kStackSize = 64L * 1024L * 1024L;   // min stack size = 64 Mb
+    const rlim_t kStackSize = 256L * 1024L * 1024L;   // min stack size = 256 Mb
     struct rlimit rl;
     rl.rlim_cur = kStackSize;
     if (getrlimit(RLIMIT_STACK, &rl) != 0)