From b7fd0bc902fb4a3ff36217c119e96e8ff7875b6a Mon Sep 17 00:00:00 2001
From: Sarbojit Sarkar <sarbojit.sarkar@amd.com>
Date: Fri, 5 Feb 2021 05:40:41 -0500
Subject: [PATCH] SWDEV-271496 - Added missing params check

Change-Id: I17bbf5ed445826e7380df22fa5c6ec1675e208d6
---
 hipamd/rocclr/hip_device.cpp         | 10 +++++-----
 hipamd/rocclr/hip_device_runtime.cpp |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hipamd/rocclr/hip_device.cpp b/hipamd/rocclr/hip_device.cpp
index 1ecc88bfc8..0a157541fb 100644
--- a/hipamd/rocclr/hip_device.cpp
+++ b/hipamd/rocclr/hip_device.cpp
@@ -40,12 +40,12 @@ amd::HostQueue* Device::NullStream(bool skip_alloc) {
 hipError_t hipDeviceGet(hipDevice_t *device, int deviceId) {
   HIP_INIT_API(hipDeviceGet, device, deviceId);
 
-  if (device != nullptr) {
-    *device = deviceId;
-  } else {
-    HIP_RETURN(hipErrorInvalidValue);
+  if (deviceId < 0 ||
+      static_cast<size_t>(deviceId) >= g_devices.size() ||
+      device == nullptr) {
+    HIP_RETURN(hipErrorInvalidDevice);
   }
-
+  *device = deviceId;
   HIP_RETURN(hipSuccess);
 };
 
diff --git a/hipamd/rocclr/hip_device_runtime.cpp b/hipamd/rocclr/hip_device_runtime.cpp
index f469bcac60..8bf4c7829e 100755
--- a/hipamd/rocclr/hip_device_runtime.cpp
+++ b/hipamd/rocclr/hip_device_runtime.cpp
@@ -414,7 +414,9 @@ hipError_t hipDeviceGetPCIBusId ( char* pciBusId, int  len, int  device ) {
 
 hipError_t hipDeviceGetSharedMemConfig ( hipSharedMemConfig * pConfig ) {
   HIP_INIT_API(hipDeviceGetSharedMemConfig, pConfig);
-
+  if (pConfig == nullptr) {
+    return HIP_RETURN(hipErrorInvalidValue);
+  }
   *pConfig = hipSharedMemBankSizeFourByte;
 
   HIP_RETURN(hipSuccess);