Merge pull request #2592 from AllanZyne/review/yang/fix_asan_free

[DeviceASAN] Fix throw "UR_RESULT_ERROR_INVALID_ARGUMENT" exception when catching free related error
oneapi-src · Feb 13, 2025 · 7e38d0a · 7e38d0a
2 parents 4ed3ba4 + 08504e8
commit 7e38d0a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/source/loader/layers/sanitizer/asan/asan_interceptor.cpp b/source/loader/layers/sanitizer/asan/asan_interceptor.cpp
@@ -175,7 +175,10 @@ ur_result_t AsanInterceptor::releaseMemory(ur_context_handle_t Context,
   if (!AllocInfoItOp) {
     // "Addr" might be a host pointer
     ReportBadFree(Addr, GetCurrentBacktrace(), nullptr);
-    return UR_RESULT_ERROR_INVALID_ARGUMENT;
+    if (getOptions().HaltOnError) {
+      exitWithErrors();
+    }
+    return UR_RESULT_SUCCESS;
   }
 
   auto AllocInfoIt = *AllocInfoItOp;
@@ -190,17 +193,26 @@ ur_result_t AsanInterceptor::releaseMemory(ur_context_handle_t Context,
       // "Addr" might be a host pointer
       ReportBadFree(Addr, GetCurrentBacktrace(), nullptr);
     }
-    return UR_RESULT_ERROR_INVALID_ARGUMENT;
+    if (getOptions().HaltOnError) {
+      exitWithErrors();
+    }
+    return UR_RESULT_SUCCESS;
   }
 
   if (Addr != AllocInfo->UserBegin) {
     ReportBadFree(Addr, GetCurrentBacktrace(), AllocInfo);
-    return UR_RESULT_ERROR_INVALID_ARGUMENT;
+    if (getOptions().HaltOnError) {
+      exitWithErrors();
+    }
+    return UR_RESULT_SUCCESS;
   }
 
   if (AllocInfo->IsReleased) {
     ReportDoubleFree(Addr, GetCurrentBacktrace(), AllocInfo);
-    return UR_RESULT_ERROR_INVALID_ARGUMENT;
+    if (getOptions().HaltOnError) {
+      exitWithErrors();
+    }
+    return UR_RESULT_SUCCESS;
   }
 
   AllocInfo->IsReleased = true;

diff --git a/source/loader/layers/sanitizer/asan/asan_options.cpp b/source/loader/layers/sanitizer/asan/asan_options.cpp
@@ -90,6 +90,7 @@ AsanOptions::AsanOptions() {
   SetBoolOption("detect_privates", DetectPrivates);
   SetBoolOption("print_stats", PrintStats);
   SetBoolOption("detect_leaks", DetectLeaks);
+  SetBoolOption("halt_on_error", HaltOnError);
 
   auto KV = OptionsEnvMap->find("quarantine_size_mb");
   if (KV != OptionsEnvMap->end()) {

diff --git a/source/loader/layers/sanitizer/asan/asan_options.hpp b/source/loader/layers/sanitizer/asan/asan_options.hpp
@@ -28,6 +28,7 @@ struct AsanOptions {
   bool PrintStats = false;
   bool DetectKernelArguments = true;
   bool DetectLeaks = true;
+  bool HaltOnError = true;
 
   explicit AsanOptions();
 };