Skip to content

Commit 72e259a

Browse files
Muhammad Bilalgregkh
authored andcommitted
drm/amdkfd: fix NULL dereference in get_queue_ids()
commit 2bd550b upstream. When usr_queue_id_array is NULL and num_queues is non-zero, get_queue_ids() returns NULL. The callers check only IS_ERR() on the return value; since IS_ERR(NULL) == false the check passes, and suspend_queues() calls q_array_invalidate() which immediately dereferences NULL while iterating num_queues times. Userspace can trigger this via kfd_ioctl_set_debug_trap() by supplying num_queues > 0 with a zero queue_array_ptr, causing a kernel panic. A NULL usr_queue_id_array with num_queues == 0 is a legitimate no-op (q_array_invalidate never executes, and resume_queues already guards all queue_ids dereferences behind a NULL check). Return ERR_PTR(-EINVAL) only when num_queues is non-zero and the pointer is absent; both callers already propagate IS_ERR() returns correctly to userspace. Fixes: a70a93f ("drm/amdkfd: add debug suspend and resume process queues operation") Signed-off-by: Muhammad Bilal <meatuni001@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit f165a82) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c0639ed commit 72e259a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3293,7 +3293,7 @@ static void copy_context_work_handler(struct work_struct *work)
32933293
static uint32_t *get_queue_ids(uint32_t num_queues, uint32_t *usr_queue_id_array)
32943294
{
32953295
if (!usr_queue_id_array)
3296-
return NULL;
3296+
return num_queues ? ERR_PTR(-EINVAL) : NULL;
32973297

32983298
if (num_queues > KFD_MAX_NUM_OF_QUEUES_PER_PROCESS)
32993299
return ERR_PTR(-EINVAL);

0 commit comments

Comments
 (0)