first round of ASan

Android-Boot-Manager · Aug 2, 2024 · 8e7dc9c · 8e7dc9c
1 parent d650fa1
commit 8e7dc9c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -32,3 +32,5 @@ add_library(${CMAKE_PROJECT_NAME} SHARED app.cpp)
 # can link libraries from various origins, such as libraries defined in this
 # build script, prebuilt third-party libraries, or Android system libraries.
 target_link_libraries(${CMAKE_PROJECT_NAME}	droidboot_gui)
+target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize-recover=address -fno-omit-frame-pointer)
+target_link_options(${CMAKE_PROJECT_NAME} PUBLIC -fsanitize=address -fsanitize-recover=address)
diff --git a/app/src/main/cpp/droidboot_gui b/app/src/main/cpp/droidboot_gui
diff --git a/app/src/main/jniLibs/arm64-v8a/libclang_rt.asan-aarch64-android.so b/app/src/main/jniLibs/arm64-v8a/libclang_rt.asan-aarch64-android.so
diff --git a/app/src/main/resources/lib/arm64-v8a/wrap.sh b/app/src/main/resources/lib/arm64-v8a/wrap.sh
@@ -0,0 +1,26 @@
+#!/system/bin/sh
+HERE=$(cd "$(dirname "$0")" && pwd)
+cmd=$1
+shift
+# This must be called *before* `LD_PRELOAD` is set. Otherwise, if this is a 32-
+# bit app running on a 64-bit device, the 64-bit getprop will fail to load
+# because it will preload a 32-bit ASan runtime.
+# https://github.com/android/ndk/issues/1744
+os_version=$(getprop ro.build.version.sdk)
+if [ "$os_version" -eq "27" ]; then
+  cmd="$cmd -Xrunjdwp:transport=dt_android_adb,suspend=n,server=y -Xcompiler-option --debuggable $@"
+elif [ "$os_version" -eq "28" ]; then
+  cmd="$cmd -XjdwpProvider:adbconnection -XjdwpOptions:suspend=n,server=y -Xcompiler-option --debuggable $@"
+else
+  cmd="$cmd -XjdwpProvider:adbconnection -XjdwpOptions:suspend=n,server=y $@"
+fi
+#export ASAN_OPTIONS=log_to_syslog=true,allow_user_segv_handler=1,detect_stack_use_after_return=true,check_initialization_order=true,halt_on_error=false
+export ASAN_OPTIONS=log_to_syslog=true
+ASAN_LIB=$(ls "$HERE"/libclang_rt.asan-*-android.so)
+if [ -f "$HERE/libc++_shared.so" ]; then
+    # Workaround for https://github.com/android-ndk/ndk/issues/988.
+    export LD_PRELOAD="$ASAN_LIB $HERE/libc++_shared.so"
+else
+    export LD_PRELOAD="$ASAN_LIB"
+fi
+exec $cmd
+3 −1		CMakeLists.txt
+1 −1		common/droidboot_stdfunc.c
+2 −1		config_parser/droidboot_config.c
+5 −5		dualboot_gui/dualboot_menu.c
+1 −1		include/droidboot_stdfunc.h