From f20f3999155a56a3d95219f4ee446ae734f2a4bc Mon Sep 17 00:00:00 2001
From: Jaydeep Patel <jaydeepkumar.patel@amd.com>
Date: Wed, 18 Dec 2024 11:47:09 +0000
Subject: [PATCH] SWDEV-505276 - Parent graph of orig node and original graph
 of cloned node should be same.

Change-Id: I6ebc21cc42e41ad5d952a69fb3b3cb095f32cffb


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

diff --git a/projects/clr/hipamd/src/hip_graph.cpp b/projects/clr/hipamd/src/hip_graph.cpp
index e68e348483..7171670f51 100644
--- a/projects/clr/hipamd/src/hip_graph.cpp
+++ b/projects/clr/hipamd/src/hip_graph.cpp
@@ -2174,12 +2174,15 @@ hipError_t hipGraphNodeFindInClone(hipGraphNode_t* pNode, hipGraphNode_t origina
     HIP_RETURN(hipErrorInvalidValue);
   }
   hip::Graph* iClonedGraph = reinterpret_cast<hip::Graph*>(clonedGraph);
-  if (iClonedGraph->getOriginalGraph() == nullptr) {
+  hip::GraphNode* iGraphnode = reinterpret_cast<hip::GraphNode*>(originalNode);
+  if (iClonedGraph->getOriginalGraph() == nullptr ||
+      // parent graph of orig node and original graph of cloned node should be same.
+      iClonedGraph->getOriginalGraph() != iGraphnode->GetParentGraph()) {
     HIP_RETURN(hipErrorInvalidValue);
   }
 
   for (auto node : iClonedGraph->GetNodes()) {
-    if (node->GetID() == reinterpret_cast<hip::GraphNode*>(originalNode)->GetID()) {
+    if (node->GetID() == iGraphnode->GetID()) {
       *pNode = reinterpret_cast<hipGraphNode_t>(node);
       HIP_RETURN(hipSuccess);
     }