Merge pull request #2569 from zhaomaosu/asan-only-warn-host-ptr

[DevASAN] Only report warning if passing host ptr to kernel
oneapi-src · Jan 17, 2025 · ef7829e · ef7829e
1 parent ffb83cc
commit ef7829e
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/source/loader/layers/sanitizer/asan/asan_interceptor.cpp b/source/loader/layers/sanitizer/asan/asan_interceptor.cpp
@@ -721,7 +721,10 @@ ur_result_t AsanInterceptor::prepareLaunch(
                     ContextInfo->Handle, DeviceInfo->Handle, (uptr)Ptr)) {
                 ReportInvalidKernelArgument(Kernel, ArgIndex, (uptr)Ptr,
                                             ValidateResult, PtrPair.second);
-                exitWithErrors();
+                if (ValidateResult.Type !=
+                    ValidateUSMResult::MAYBE_HOST_POINTER) {
+                    exitWithErrors();
+                }
             }
         }
     }
@@ -864,13 +867,15 @@ AsanInterceptor::findAllocInfoByAddress(uptr Address) {
     std::shared_lock<ur_shared_mutex> Guard(m_AllocationMapMutex);
     auto It = m_AllocationMap.upper_bound(Address);
     if (It == m_AllocationMap.begin()) {
-        return std::optional<AllocationIterator>{};
+        return std::nullopt;
     }
     --It;
-    // Make sure we got the right AllocInfo
-    assert(Address >= It->second->AllocBegin &&
-           Address < It->second->AllocBegin + It->second->AllocSize &&
-           "Wrong AllocInfo for the address");
+
+    // Maybe it's a host pointer
+    if (Address < It->second->AllocBegin ||
+        Address >= It->second->AllocBegin + It->second->AllocSize) {
+        return std::nullopt;
+    }
     return It;
 }