Commit 86a54e45 authored by Rahul Kumar's avatar Rahul Kumar Committed by Alex Deucher
Browse files

drm/amdgpu: Use kmalloc_array() instead of kmalloc() 



Documentation/process/deprecated.rst recommends against the use of
kmalloc with dynamic size calculations due to the risk of overflow and
smaller allocation being made than the caller was expecting.

Replace kmalloc() with kmalloc_array() in amdgpu_amdkfd_gfx_v10.c,
amdgpu_amdkfd_gfx_v10_3.c, amdgpu_amdkfd_gfx_v11.c and
amdgpu_amdkfd_gfx_v12.c to make the intended allocation size clearer
and avoid potential overflow issues.

Suggested-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarRahul Kumar <rk0006818@gmail.com>
Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2f9c6388

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int kgd_hqd_dump(struct amdgpu_device *adev, 
		(*dump)[i++][1] = RREG32_SOC15_IP(GC, addr);		\

	} while (0)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;
@@ -449,7 +449,7 @@ static int kgd_hqd_sdma_dump(struct amdgpu_device *adev, 
#undef HQD_N_REGS

#define HQD_N_REGS (19+6+7+10)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int hqd_dump_v10_3(struct amdgpu_device *adev, 
		(*dump)[i++][1] = RREG32_SOC15_IP(GC, addr);		\

	} while (0)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;
@@ -435,7 +435,7 @@ static int hqd_sdma_dump_v10_3(struct amdgpu_device *adev, 
#undef HQD_N_REGS

#define HQD_N_REGS (19+6+7+12)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c

+2 −2
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static int hqd_dump_v11(struct amdgpu_device *adev, 
		(*dump)[i++][1] = RREG32(addr);		\

	} while (0)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;
@@ -420,7 +420,7 @@ static int hqd_sdma_dump_v11(struct amdgpu_device *adev, 
#undef HQD_N_REGS

#define HQD_N_REGS (7+11+1+12+12)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int hqd_dump_v12(struct amdgpu_device *adev, 
		(*dump)[i++][1] = RREG32(addr);		\

	} while (0)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;
@@ -146,7 +146,7 @@ static int hqd_sdma_dump_v12(struct amdgpu_device *adev, 
#undef HQD_N_REGS

#define HQD_N_REGS (last_reg - first_reg + 1)



	*dump = kmalloc(HQD_N_REGS*2*sizeof(uint32_t), GFP_KERNEL);

	*dump = kmalloc_array(HQD_N_REGS, sizeof(**dump), GFP_KERNEL);

	if (*dump == NULL)

		return -ENOMEM;