AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct order of argument check and default assignment in lock APIs.

Browse Source 
Argument must be checked for nullptr before being dereferenced and
filled with the default return value.

Change-Id: I9ff366f066a5e18c78129bf59cc3ba00fca3ef18


[ROCm/ROCR-Runtime commit: f48a786662]
This commit is contained in:
Sean Keely
2021-11-15 19:10:45 -06:00
parent a7dc6d7802
commit 289cc7b6b4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa_ext_amd.cpp
+8 -7
View File
@@ -567,14 +567,14 @@ hsa_status_t hsa_amd_memory_lock(void* host_ptr, size_t size,
void** agent_ptr) {
TRY;
IS_OPEN();
*agent_ptr = NULL;
if (size == 0 || host_ptr == NULL || agent_ptr == NULL) {
if (size == 0 || host_ptr == nullptr || agent_ptr == nullptr) {
return HSA_STATUS_ERROR_INVALID_ARGUMENT;
}
if ((agents != NULL && num_agent == 0) ||
(agents == NULL && num_agent != 0)) {
*agent_ptr = nullptr;
if ((agents != nullptr && num_agent == 0) || (agents == nullptr && num_agent != 0)) {
return HSA_STATUS_ERROR_INVALID_ARGUMENT;
}
@@ -598,13 +598,14 @@ hsa_status_t hsa_amd_memory_lock_to_pool(void* host_ptr, size_t size, hsa_agent_
void** agent_ptr) {
TRY;
IS_OPEN();
*agent_ptr = NULL;
if (size == 0 || host_ptr == NULL || agent_ptr == NULL || flags != 0) {
if (size == 0 || host_ptr == nullptr || agent_ptr == nullptr || flags != 0) {
return HSA_STATUS_ERROR_INVALID_ARGUMENT;
}
if ((agents != NULL && num_agent == 0) || (agents == NULL && num_agent != 0)) {
*agent_ptr = nullptr;
if ((agents != nullptr && num_agent == 0) || (agents == nullptr && num_agent != 0)) {
return HSA_STATUS_ERROR_INVALID_ARGUMENT;
}