瀏覽代碼

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 <mikita.lipski@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Mikita Lipski 7 年之前
父節點
當前提交
088e7c1617
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+ 3 - 2
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;
 	int i, r;
 
 
 	amdgpu_amdkfd_device_fini(adev);
 	amdgpu_amdkfd_device_fini(adev);
+	/* disable all interrupts */
+	amdgpu_irq_disable_all(adev);
+
 	/* need to disable SMC first */
 	/* need to disable SMC first */
 	for (i = 0; i < adev->num_ip_blocks; i++) {
 	for (i = 0; i < adev->num_ip_blocks; i++) {
 		if (!adev->ip_blocks[i].status.hw)
 		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;
 		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--) {
 	for (i = adev->num_ip_blocks - 1; i >= 0; i--) {
 		if (!adev->ip_blocks[i].status.sw)
 		if (!adev->ip_blocks[i].status.sw)