From 33c7a5e44956e006b9db38746a864a4bf8e059c6 Mon Sep 17 00:00:00 2001
From: Matt Schwager <matt.schwager@trailofbits.com>
Date: Wed, 24 Jan 2024 07:41:41 -0700
Subject: [PATCH] Add coverage support by stripping preinit info, and switch to
 entrypoint script

---
 Dockerfile    | 33 +++++++++++++++++++++++++++------
 entrypoint.sh |  5 +++++
 2 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100755 entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index 0b70a1f..206428b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,10 @@ ARG CLANG_ARCH=aarch64
 ARG CLANG_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/clang+llvm-17.0.6-aarch64-linux-gnu.tar.xz
 ARG CLANG_CHECKSUM=6dd62762285326f223f40b8e4f2864b5c372de3f7de0731cb7cd55ca5287b75a
 
+ENV CLANG_ARCH=${CLANG_ARCH}
+ENV CLANG_URL=${CLANG_URL}
+ENV CLANG_CHECKSUM=${CLANG_CHECKSUM}
+
 ENV CLANG_FILE clang.tar.xz
 RUN wget -q -O $CLANG_FILE $CLANG_URL && \
     echo "$CLANG_CHECKSUM  $CLANG_FILE" | sha256sum -c - && \
@@ -35,10 +39,29 @@ ENV LDSHARED "$CLANG_DIR/bin/clang -shared"
 ENV LDSHAREDXX "$CLANG_DIR/bin/clang++ -shared"
 ENV ASAN_SYMBOLIZER_PATH "$CLANG_DIR/bin/llvm-symbolizer"
 
-# LOCAL_LIBS is supported by the Ruby "mkmf" library and C extension Makefile
-ENV LOCAL_LIBS "$CLANG_DIR/lib/clang/17/lib/$CLANG_ARCH-unknown-linux-gnu/libclang_rt.fuzzer_no_main.a"
+ENV FUZZER_NO_MAIN_LIB "$CLANG_DIR/lib/clang/17/lib/$CLANG_ARCH-unknown-linux-gnu/libclang_rt.fuzzer_no_main.a"
+ENV ASAN_LIB "$CLANG_DIR/lib/clang/17/lib/$CLANG_ARCH-unknown-linux-gnu/libclang_rt.asan.a"
+ENV ASAN_STRIPPED_LIB "/tmp/libclang_rt.asan.a"
+ENV ASAN_MERGED_LIB "/tmp/asan_with_fuzzer.so"
+
+# https://github.com/google/atheris/blob/master/native_extension_fuzzing.md#why-this-is-necessary
+RUN cp "$ASAN_LIB" /tmp
+RUN ar d "$ASAN_STRIPPED_LIB" asan_preinit.cc.o asan_preinit.cpp.o
+RUN "$CC" \
+    -Wl,--whole-archive \
+    "$FUZZER_NO_MAIN_LIB" \
+    "$ASAN_STRIPPED_LIB" \
+    -Wl,--no-whole-archive \
+    -lpthread -ldl -shared \
+    -o "$ASAN_MERGED_LIB"
 
-# Respect ENV variables when compiling C extension, like LOCAL_LIBS above
+# The LOCAL_LIBS variable allows linking arbitrary libraries into Ruby C
+# extensions. It is supported by the Ruby mkmf library and C extension Makefile.
+# For more information, see https://github.com/ruby/ruby/blob/master/lib/mkmf.rb.
+ENV LOCAL_LIBS=${FUZZER_NO_MAIN_LIB}
+
+# The MAKE variable allows overwriting the make command at runtime. This forces the
+# Ruby C extension to respect ENV variables when compiling, like LOCAL_LIBS above.
 ENV MAKE "make --environment-overrides V=1"
 
 # 1. Skip memory allocation failures for now, they are common, and low impact (DoS)
@@ -53,7 +76,5 @@ RUN bundler3.1 install
 COPY . .
 RUN rake compile
 
-ENV LD_PRELOAD "$CLANG_DIR/lib/clang/17/lib/$CLANG_ARCH-unknown-linux-gnu/libclang_rt.asan.so"
-
-ENTRYPOINT ["ruby", "-Ilib", "bin/dummy.rb"]
+ENTRYPOINT ["./entrypoint.sh"]
 CMD ["-help=1"]
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..2c8bc76
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export LD_PRELOAD=${ASAN_MERGED_LIB}
+
+ruby -Ilib bin/dummy.rb "$@"