From 57d3fb695948734d71238c81b7ecb819570364c0 Mon Sep 17 00:00:00 2001 From: jsg Date: Sat, 15 Jun 2024 03:46:43 +0000 Subject: [PATCH] drm/amdgpu/mes: fix use-after-free issue From Jack Xiao 39cfce75168c11421d70b8c0c65f6133edccb82a in linux-6.6.y/6.6.33 948255282074d9367e01908b3f5dcf8c10fc9c3d in mainline linux --- sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c index a88eff2f53b..3cb010f1f5e 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_mes.c @@ -1098,6 +1098,7 @@ void amdgpu_mes_remove_ring(struct amdgpu_device *adev, return; amdgpu_mes_remove_hw_queue(adev, ring->hw_queue_id); + del_timer_sync(&ring->fence_drv.fallback_timer); amdgpu_ring_fini(ring); kfree(ring); } -- 2.20.1