From de904d8716cec8f48b0b1a7c6acb315fd46b60e3 Mon Sep 17 00:00:00 2001 From: pghafari Date: Tue, 17 Jan 2023 08:00:16 -0500 Subject: [PATCH] SWDEV-374381 - updated error check for hipGraphAddMemcpyNodeFrom/ToSymbol Change-Id: I4de063a5a9307148bf4da0e8a2edc1d3b01a8b9a [ROCm/clr commit: d491ee7385624a2470b9ee3af6c68ab7ff4c462b] --- projects/clr/hipamd/src/hip_graph.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/clr/hipamd/src/hip_graph.cpp b/projects/clr/hipamd/src/hip_graph.cpp index a7dec1489f..4b5d9e1586 100644 --- a/projects/clr/hipamd/src/hip_graph.cpp +++ b/projects/clr/hipamd/src/hip_graph.cpp @@ -1125,10 +1125,6 @@ hipError_t hipGraphAddMemcpyNode(hipGraphNode_t* pGraphNode, hipGraph_t graph, const hipMemcpy3DParms* pCopyParams) { HIP_INIT_API(hipGraphAddMemcpyNode, pGraphNode, graph, pDependencies, numDependencies, pCopyParams); - if (pGraphNode == nullptr || graph == nullptr || pCopyParams == nullptr || - (numDependencies > 0 && pDependencies == nullptr)) { - HIP_RETURN(hipErrorInvalidValue); - } HIP_RETURN_DURATION(ihipGraphAddMemcpyNode(pGraphNode, graph, pDependencies, numDependencies, pCopyParams, false)); @@ -1857,7 +1853,7 @@ hipError_t hipGraphAddMemcpyNodeFromSymbol(hipGraphNode_t* pGraphNode, hipGraph_ size_t count, size_t offset, hipMemcpyKind kind) { HIP_INIT_API(hipGraphAddMemcpyNodeFromSymbol, pGraphNode, graph, pDependencies, numDependencies, dst, symbol, count, offset, kind); - if (graph == nullptr || pGraphNode == nullptr || + if (graph == nullptr || pGraphNode == nullptr || count == 0 || (numDependencies > 0 && pDependencies == nullptr) || dst == nullptr || !ihipGraph::isGraphValid(graph)) { HIP_RETURN(hipErrorInvalidValue); @@ -1916,7 +1912,7 @@ hipError_t hipGraphAddMemcpyNodeToSymbol(hipGraphNode_t* pGraphNode, hipGraph_t hipMemcpyKind kind) { HIP_INIT_API(hipGraphAddMemcpyNodeToSymbol, pGraphNode, graph, pDependencies, numDependencies, symbol, src, count, offset, kind); - if (pGraphNode == nullptr || graph == nullptr || src == nullptr || + if (pGraphNode == nullptr || graph == nullptr || src == nullptr || count == 0 || !ihipGraph::isGraphValid(graph) || (pDependencies == nullptr && numDependencies > 0)) { HIP_RETURN(hipErrorInvalidValue); }