From 6f2179d9d8b397c8aface291693d7c0c5bd6d331 Mon Sep 17 00:00:00 2001
From: kjayapra-amd <karthik.jayaprakash@amd.com>
Date: Wed, 15 May 2024 09:59:46 -0400
Subject: [PATCH] SWDEV-458026 - Check for hsa_handle/svm_ptr before removing
 from MemObjMap.

Change-Id: I967735c01c6321eeb768963ecb88667dbbe92f08


[ROCm/clr commit: fa4c1a02069c4f6925adb4e2168d5a908d6ab550]
---
 projects/clr/hipamd/src/hip_vm.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/src/hip_vm.cpp b/projects/clr/hipamd/src/hip_vm.cpp
index 79bd1230aa..5dae1d2721 100644
--- a/projects/clr/hipamd/src/hip_vm.cpp
+++ b/projects/clr/hipamd/src/hip_vm.cpp
@@ -247,7 +247,9 @@ hipError_t hipMemImportFromShareableHandle(hipMemGenericAllocationHandle_t* hand
   phys_mem_obj->getUserData().data = new hip::GenericAllocation(*phys_mem_obj, 0, prop);
   *handle = reinterpret_cast<hipMemGenericAllocationHandle_t>(phys_mem_obj->getUserData().data);
 
-  amd::MemObjMap::RemoveMemObj(phys_mem_obj->getSvmPtr());
+  if (amd::MemObjMap::FindMemObj(phys_mem_obj->getSvmPtr())) {
+    amd::MemObjMap::RemoveMemObj(phys_mem_obj->getSvmPtr());
+  }
 
   HIP_RETURN(hipSuccess);
 }