From: Mikita Lipski Date: Thu, 15 Mar 2018 13:37:08 +0000 (-0400) Subject: drm/amdgpu: Disable irq on device before destroying it X-Git-Tag: v4.17-rc1~185^2~4^2~63 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=088e7c16170645f1e2298ec6e0029079ef603635;p=users%2Fhch%2Fmisc.git drm/amdgpu: Disable irq on device before destroying it Disable irq on devices before destroying them. That prevents use-after-free memory access when unloading the driver. Signed-off-by: Mikita Lipski Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index cdf7a6cde603..f59b017e4c61 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1722,6 +1722,9 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) int i, r; amdgpu_amdkfd_device_fini(adev); + /* disable all interrupts */ + amdgpu_irq_disable_all(adev); + /* need to disable SMC first */ for (i = 0; i < adev->num_ip_blocks; i++) { if (!adev->ip_blocks[i].status.hw) @@ -1773,8 +1776,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) adev->ip_blocks[i].status.hw = false; } - /* disable all interrupts */ - amdgpu_irq_disable_all(adev); for (i = adev->num_ip_blocks - 1; i >= 0; i--) { if (!adev->ip_blocks[i].status.sw)