From aeba964a7e4c0815bf5a2713330cc2610f52f8f3 Mon Sep 17 00:00:00 2001 From: Philip Salzmann Date: Fri, 4 Oct 2019 10:09:19 +0200 Subject: [PATCH] Fix uninitialized var in hipDeviceGetAttribute (#1497) This fixes the usage of an uninitialized cdattr variable in hipDeviceGetAttribute for the CUDA backend when taking the switch default, as detailed in #1317. Note that the directed_tests/runtimeApi/device/hipGetDeviceAttribute.tst test fails for me, but it already did before applying this patch. Let's see what CI says! [ROCm/hip commit: 9ababa4276e1950b6966cf2752ce825ad6f2b299] --- projects/hip/include/hip/nvcc_detail/hip_runtime_api.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/hip/include/hip/nvcc_detail/hip_runtime_api.h b/projects/hip/include/hip/nvcc_detail/hip_runtime_api.h index b788aa5cdc..97551d15d4 100644 --- a/projects/hip/include/hip/nvcc_detail/hip_runtime_api.h +++ b/projects/hip/include/hip/nvcc_detail/hip_runtime_api.h @@ -992,8 +992,7 @@ inline static hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t att cdattr = cudaDevAttrEccEnabled; break; default: - cerror = cudaErrorInvalidValue; - break; + return hipCUDAErrorTohipError(cudaErrorInvalidValue); } cerror = cudaDeviceGetAttribute(pi, cdattr, device);