From 364006e51bdec08a148955ee6b9aad08497019ea Mon Sep 17 00:00:00 2001
From: Piotr Balcer <piotr.balcer@intel.com>
Date: Tue, 19 Aug 2025 17:14:26 +0200
Subject: [PATCH] [UR] fix coverity issues (#19817)

---
 .../source/adapters/level_zero/enqueued_pool.hpp    |  3 ++-
 .../loader/layers/sanitizer/msan/msan_shadow.cpp    | 11 +++--------
 unified-runtime/source/loader/ur_lib.cpp            | 13 +++++++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/unified-runtime/source/adapters/level_zero/enqueued_pool.hpp b/unified-runtime/source/adapters/level_zero/enqueued_pool.hpp
index 66577b7652db2..0c548babc7ed3 100644
--- a/unified-runtime/source/adapters/level_zero/enqueued_pool.hpp
+++ b/unified-runtime/source/adapters/level_zero/enqueued_pool.hpp
@@ -34,7 +34,8 @@ class EnqueuedPool {
 
   EnqueuedPool(event_release_callback_t EventReleaseFn,
                memory_free_callback_t MemFreeFn)
-      : EventReleaseFn(EventReleaseFn), MemFreeFn(MemFreeFn) {}
+      : EventReleaseFn(std::move(EventReleaseFn)),
+        MemFreeFn(std::move(MemFreeFn)) {}
 
   ~EnqueuedPool();
   std::optional<Allocation> getBestFit(size_t Size, size_t Alignment,
diff --git a/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp b/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp
index 123dab662f117..12ee3154cc7fa 100644
--- a/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp
+++ b/unified-runtime/source/loader/layers/sanitizer/msan/msan_shadow.cpp
@@ -88,12 +88,9 @@ ur_result_t MsanShadowMemoryCPU::Setup() {
       uptr End = kMemoryLayout[i].end;
       uptr Size = End - Start;
       MappingDesc::Type Type = kMemoryLayout[i].type;
-      bool InitOrigins = true;
 
-      bool IsMap = Type == MappingDesc::SHADOW ||
-                   (InitOrigins && Type == MappingDesc::ORIGIN);
-      bool IsProtect = Type == MappingDesc::INVALID ||
-                       (!InitOrigins && Type == MappingDesc::ORIGIN);
+      bool IsMap = Type == MappingDesc::SHADOW || Type == MappingDesc::ORIGIN;
+      bool IsProtect = Type == MappingDesc::INVALID;
 
       if (IsMap) {
         if (MmapFixedNoReserve(Start, Size) == 0) {
@@ -124,9 +121,7 @@ ur_result_t MsanShadowMemoryCPU::Destory() {
       uptr End = kMemoryLayout[i].end;
       uptr Size = End - Start;
       MappingDesc::Type Type = kMemoryLayout[i].type;
-      bool InitOrigins = true;
-      bool IsMap = Type == MappingDesc::SHADOW ||
-                   (InitOrigins && Type == MappingDesc::ORIGIN);
+      bool IsMap = Type == MappingDesc::SHADOW || Type == MappingDesc::ORIGIN;
       if (IsMap) {
         if (Munmap(Start, Size)) {
           return UR_RESULT_ERROR_UNKNOWN;
diff --git a/unified-runtime/source/loader/ur_lib.cpp b/unified-runtime/source/loader/ur_lib.cpp
index e186f188f2a51..08a5d0d9d0184 100644
--- a/unified-runtime/source/loader/ur_lib.cpp
+++ b/unified-runtime/source/loader/ur_lib.cpp
@@ -647,10 +647,15 @@ ur_result_t urDeviceGetSelected(ur_platform_handle_t hPlatform,
                    [&](ur_device_handle_t urDeviceHandle) {
                      // obtain and record device type from platform (squash
                      // errors)
-                     ur_device_type_t hardwareType = ::UR_DEVICE_TYPE_DEFAULT;
-                     urDeviceGetInfo(urDeviceHandle, UR_DEVICE_INFO_TYPE,
-                                     sizeof(ur_device_type_t), &hardwareType,
-                                     0);
+                     ur_device_type_t hardwareType;
+                     ur_result_t res = urDeviceGetInfo(
+                         urDeviceHandle, UR_DEVICE_INFO_TYPE,
+                         sizeof(ur_device_type_t), &hardwareType, 0);
+                     // ignore failures and just assume the default hw type
+                     if (res != UR_RESULT_SUCCESS) {
+                       hardwareType = ::UR_DEVICE_TYPE_DEFAULT;
+                     }
+
                      return DeviceSpec{DevicePartLevel::ROOT, hardwareType,
                                        deviceCount++,         DeviceIdTypeALL,
                                        DeviceIdTypeALL,       urDeviceHandle};