From bb53dfb244fc4a9eb964d6ed9733c748d80b6862 Mon Sep 17 00:00:00 2001
From: Sarbojit Sarkar <sarbojit.sarkar@amd.com>
Date: Thu, 3 Mar 2022 10:03:45 +0000
Subject: [PATCH] SWDEV-325799 - Fix segfault with hipStreamPerThread

Change-Id: Ie6d4bf55131d65590234796443373b968a21b3d2


[ROCm/clr commit: 53b488811378ec647c0720eeefb3878513c10ee1]
---
 projects/clr/hipamd/src/hip_module.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp
index 744283b024..3c538420c7 100644
--- a/projects/clr/hipamd/src/hip_module.cpp
+++ b/projects/clr/hipamd/src/hip_module.cpp
@@ -553,6 +553,12 @@ hipError_t ihipLaunchCooperativeKernelMultiDevice(hipLaunchParams* launchParamsL
   if ((numDevices > numActiveGPUs) || (launchParamsList == nullptr)) {
     return hipErrorInvalidValue;
   }
+  // Validate all streams passed by user
+  for (int i = 0; i < numDevices; ++i) {
+    if (!hip::isValid(launchParamsList[i].stream)) {
+        return hipErrorInvalidValue;
+    }
+  }
 
   uint64_t allGridSize = 0;
   std::vector<const amd::Device*> mgpu_list(numDevices);