Commit a1144da7 authored by Li Huafei's avatar Li Huafei Committed by Alex Deucher
Browse files

drm/amdgpu: Fix the memory allocation issue in amdgpu_discovery_get_nps_info() 



Fix two issues with memory allocation in amdgpu_discovery_get_nps_info()
for mem_ranges:

 - Add a check for allocation failure to avoid dereferencing a null
   pointer.

 - As suggested by Christophe, use kvcalloc() for memory allocation,
   which checks for multiplication overflow.

Additionally, assign the output parameters nps_type and range_cnt after
the kvcalloc() call to prevent modifying the output parameters in case
of an error return.

Fixes: b194d21b ("drm/amdgpu: Use NPS ranges from discovery table")
Suggested-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarLi Huafei <lihuafei1@huawei.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 35984fd4

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

+5 −3
Original line number Diff line number Diff line
@@ -1795,11 +1795,13 @@ int amdgpu_discovery_get_nps_info(struct amdgpu_device *adev, 


	switch (le16_to_cpu(nps_info->v1.header.version_major)) {

	case 1:

		mem_ranges = kvcalloc(nps_info->v1.count,

				      sizeof(*mem_ranges),

				      GFP_KERNEL);

		if (!mem_ranges)

			return -ENOMEM;

		*nps_type = nps_info->v1.nps_type;

		*range_cnt = nps_info->v1.count;

		mem_ranges = kvzalloc(

			*range_cnt * sizeof(struct amdgpu_gmc_memrange),

			GFP_KERNEL);

		for (i = 0; i < *range_cnt; i++) {

			mem_ranges[i].base_address =

				nps_info->v1.instance_info[i].base_address;