From aea1990fe05f0650775df32b475cd0519deb8dd5 Mon Sep 17 00:00:00 2001 From: Marko Arandjelovic Date: Thu, 20 Feb 2025 22:24:41 +0530 Subject: [PATCH] SWDEV-499927 - Add nullchecks to hipMemCreate and GetAllocationGranularity Change-Id: I9bb879ce2c702e660ae5e6372cb27fdb8600566b --- .../hip/nvidia_detail/nvidia_hip_runtime_api.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/hipnv/include/hip/nvidia_detail/nvidia_hip_runtime_api.h b/hipnv/include/hip/nvidia_detail/nvidia_hip_runtime_api.h index 792b965162..f63e0afba5 100644 --- a/hipnv/include/hip/nvidia_detail/nvidia_hip_runtime_api.h +++ b/hipnv/include/hip/nvidia_detail/nvidia_hip_runtime_api.h @@ -2857,15 +2857,23 @@ inline static CUmemAccessDesc* hipMemAccessDescToCUmemAccessDesc(const hipMemAcc inline static hipError_t hipMemGetAllocationGranularity(size_t* granularity, const hipMemAllocationProp* prop, hipMemAllocationGranularity_flags option) { - CUmemAllocationProp cuProp = hipMemAllocationPropToCUmemAllocationProp(prop); - return hipCUResultTohipError(cuMemGetAllocationGranularity(granularity, &cuProp, option)); + if (prop == NULL) { + return hipCUResultTohipError(cuMemGetAllocationGranularity(granularity, NULL, option)); + } else { + CUmemAllocationProp cuProp = hipMemAllocationPropToCUmemAllocationProp(prop); + return hipCUResultTohipError(cuMemGetAllocationGranularity(granularity, &cuProp, option)); + } } inline static hipError_t hipMemCreate(hipMemGenericAllocationHandle_t* handle, size_t size, const hipMemAllocationProp* prop, unsigned long long flags) { - CUmemAllocationProp cuProp = hipMemAllocationPropToCUmemAllocationProp(prop); - return hipCUResultTohipError(cuMemCreate(handle, size, &cuProp, flags)); + if (prop == NULL) { + return hipCUResultTohipError(cuMemCreate(handle, size, NULL, flags)); + } else { + CUmemAllocationProp cuProp = hipMemAllocationPropToCUmemAllocationProp(prop); + return hipCUResultTohipError(cuMemCreate(handle, size, &cuProp, flags)); + } } inline static hipError_t hipMemRelease(hipMemGenericAllocationHandle_t handle) { return hipCUResultTohipError(cuMemRelease(handle));