Commit 74b73fa5 authored by Alysa Liu's avatar Alysa Liu Committed by Alex Deucher
Browse files

drm/amdkfd: Add upper bound check for num_of_nodes 



drm/amdkfd: Add upper bound check for num_of_nodes
in kfd_ioctl_get_process_apertures_new.

Reviewed-by: default avatarHarish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: default avatarAlysa Liu <Alysa.Liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 98ff46a5ea090c14d2cdb4f5b993b05d74f3949f)
Cc: stable@vger.kernel.org
parent 11b31549

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+3 −0
Original line number Diff line number Diff line
@@ -776,6 +776,9 @@ static int kfd_ioctl_get_process_apertures_new(struct file *filp, 
		goto out_unlock;

	}



	if (args->num_of_nodes > kfd_topology_get_num_devices())

		return -EINVAL;



	/* Fill in process-aperture information for all available

	 * nodes, but not more than args->num_of_nodes as that is

	 * the amount of memory allocated by user

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ static inline struct kfd_node *kfd_node_by_irq_ids(struct amdgpu_device *adev, 
	return NULL;

}

int kfd_topology_enum_kfd_devices(uint8_t idx, struct kfd_node **kdev);

uint32_t kfd_topology_get_num_devices(void);

int kfd_numa_node_to_apic_id(int numa_node_id);

uint32_t kfd_gpu_node_num(void);

drivers/gpu/drm/amd/amdkfd/kfd_topology.c

+11 −0
Original line number Diff line number Diff line
@@ -2297,6 +2297,17 @@ int kfd_topology_remove_device(struct kfd_node *gpu) 
	return res;

}



uint32_t kfd_topology_get_num_devices(void)

{

	uint32_t num_devices;



	down_read(&topology_lock);

	num_devices = sys_props.num_devices;

	up_read(&topology_lock);



	return num_devices;

}



/* kfd_topology_enum_kfd_devices - Enumerate through all devices in KFD

 *	topology. If GPU device is found @idx, then valid kfd_dev pointer is

 *	returned through @kdev