ST: Enable asan for ST when configuring.

winlinvip · Aug 22, 2024 · e507b50 · e507b50
1 parent 4766ceb
commit e507b50
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
@@ -267,6 +267,10 @@ fi
 if [[ $SRS_DEBUG_STATS == YES ]]; then
     _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DDEBUG_STATS"
 fi
+# Whether to enable asan.
+if [[ $SRS_SANITIZER == YES ]]; then
+    _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DMD_ASAN -fsanitize=address -fno-omit-frame-pointer"
+fi
 # Pass the global extra flags.
 if [[ $SRS_EXTRA_FLAGS != '' ]]; then
     _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS $SRS_EXTRA_FLAGS"

diff --git a/trunk/research/st/asan-switch.cpp b/trunk/research/st/asan-switch.cpp
@@ -6,10 +6,6 @@ g++ asan-switch.cpp ../../objs/st/libst.a -fsanitize=address -fno-omit-frame-poi
 #include <sys/resource.h>
 #include "../../objs/st/st.h"
 
-extern "C" {
-extern void st_set_primordial_stack(void* top, void* bottom);
-}
-
 void* foo(void *args) {
     for (int i = 0; ; i++) {
         st_sleep(1);

diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp
@@ -253,6 +253,12 @@ srs_error_t do_main(int argc, char** argv, char** envp)
 
 int main(int argc, char** argv, char** envp)
 {
+#ifdef SRS_SANITIZER
+    // Setup the primordial stack for st.
+    register void* stack_top asm ("sp") = NULL;
+    srs_set_primordial_stack(stack_top);
+#endif
+
     srs_error_t err = do_main(argc, argv, envp);
 
     if (err != srs_success) {

diff --git a/trunk/src/protocol/srs_protocol_st.cpp b/trunk/src/protocol/srs_protocol_st.cpp
@@ -9,6 +9,7 @@
 #include <st.h>
 #include <fcntl.h>
 #include <sys/socket.h>
+#include <sys/resource.h>
 #include <netdb.h>
 using namespace std;
 
@@ -38,6 +39,23 @@ bool srs_st_epoll_is_supported(void)
 }
 #endif
 
+#ifdef SRS_SANITIZER
+void srs_set_primordial_stack(void *stack_top)
+{
+    if (!stack_top) {
+        return;
+    }
+
+    struct rlimit limit;
+    if (getrlimit (RLIMIT_STACK, &limit) != 0) {
+        return;
+    }
+
+    void* stack_bottom = (char*)stack_top - (uint64_t)limit.rlim_cur;
+    st_set_primordial_stack(stack_top, stack_bottom);
+}
+#endif
+
 srs_error_t srs_st_init()
 {
 #ifdef __linux__

diff --git a/trunk/src/protocol/srs_protocol_st.hpp b/trunk/src/protocol/srs_protocol_st.hpp
@@ -20,6 +20,12 @@ typedef void* srs_thread_t;
 typedef void* srs_cond_t;
 typedef void* srs_mutex_t;
 
+
+#ifdef SRS_SANITIZER
+// Setup the primordial stack for asan detecting.
+void srs_set_primordial_stack(void *top);
+#endif
+
 // Initialize ST, requires epoll for linux.
 extern srs_error_t srs_st_init();
 // Destroy ST, free resources for asan detecting.