From 4210f70627d581f12588850b2fdffc040ea9045d Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 13 Mar 2026 02:57:56 +0000 Subject: [PATCH] drm/amdgpu/userq: Do not allow userspace to trivially triger kernel warnings From Tvrtko Ursulin 1753f5f81ab60a553287f9ee659a6ac363adf8d7 in linux-6.18.y/6.18.17 7b7d7693a55d606d700beb9549c9f7f0e5d9c24f in mainline linux --- sys/dev/pci/drm/amd/amdgpu/amdgpu_userq_fence.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_userq_fence.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_userq_fence.c index cceb3842dd2..c900046ba99 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_userq_fence.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_userq_fence.c @@ -858,7 +858,7 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, dma_resv_for_each_fence(&resv_cursor, gobj_read[i]->resv, DMA_RESV_USAGE_READ, fence) { - if (WARN_ON_ONCE(num_fences >= wait_info->num_fences)) { + if (num_fences >= wait_info->num_fences) { r = -EINVAL; goto free_fences; } @@ -875,7 +875,7 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, dma_resv_for_each_fence(&resv_cursor, gobj_write[i]->resv, DMA_RESV_USAGE_WRITE, fence) { - if (WARN_ON_ONCE(num_fences >= wait_info->num_fences)) { + if (num_fences >= wait_info->num_fences) { r = -EINVAL; goto free_fences; } @@ -899,7 +899,7 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, goto free_fences; dma_fence_unwrap_for_each(f, &iter, fence) { - if (WARN_ON_ONCE(num_fences >= wait_info->num_fences)) { + if (num_fences >= wait_info->num_fences) { r = -EINVAL; goto free_fences; } @@ -923,7 +923,7 @@ int amdgpu_userq_wait_ioctl(struct drm_device *dev, void *data, if (r) goto free_fences; - if (WARN_ON_ONCE(num_fences >= wait_info->num_fences)) { + if (num_fences >= wait_info->num_fences) { r = -EINVAL; goto free_fences; }