From 6b628eca2e1a954c2e006fd77d155d5327f190ca Mon Sep 17 00:00:00 2001
From: kjayapra-amd <karthik.jayaprakash@amd.com>
Date: Wed, 9 Aug 2023 13:21:41 -0400
Subject: [PATCH] SWDEV-416218 - Set the image mapped flag correctly on COMGR
 path.

Change-Id: I6c0908731f10c8ff5b3e159c0cfb68ce096c7bdf


[ROCm/clr commit: d18f4b1ad406b6ab6d28e44437adf7928c42148e]
---
 projects/clr/hipamd/src/hip_fatbin.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/projects/clr/hipamd/src/hip_fatbin.cpp b/projects/clr/hipamd/src/hip_fatbin.cpp
index bcc45f5184..741241c8fd 100644
--- a/projects/clr/hipamd/src/hip_fatbin.cpp
+++ b/projects/clr/hipamd/src/hip_fatbin.cpp
@@ -94,11 +94,13 @@ hipError_t FatBinaryInfo::ExtractFatBinaryUsingCOMGR(const std::vector<hip::Devi
       return hipErrorInvalidValue;
 
     // If image_ is nullptr, then file path is passed via hipMod* APIs, so map the file.
-    if (image_ == nullptr && !amd::Os::MemoryMapFileDesc(fdesc_, fsize_, foffset_, &image_)
-                          && (image_mapped_ = true)) {
-      LogError("Cannot map the file descriptor");
-      amd::Os::CloseFileHandle(fdesc_);
-      return hipErrorInvalidValue;
+    if (image_ == nullptr) {
+      if(!amd::Os::MemoryMapFileDesc(fdesc_, fsize_, foffset_, &image_)) {
+        LogError("Cannot map the file descriptor");
+        amd::Os::CloseFileHandle(fdesc_);
+        return hipErrorInvalidValue;
+      }
+      image_mapped_ = true;
     }
   }