drm/amdgpu: set ip specific ras interface pointer to NULL after free it

to prevent access to dangling pointers

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 196a142..e40c34d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -4444,14 +4444,17 @@ static int gfx_v9_0_ecc_late_init(void *handle)
                r = amdgpu_irq_get(adev, &adev->gfx.cp_ecc_error_irq, 0);
                if (r)
                        goto late_fini;
-       } else
-               kfree(adev->gfx.ras_if);
+       } else {
+               r = 0;
+               goto free;
+       }
 
        return 0;
 late_fini:
        amdgpu_ras_late_fini(adev, adev->gfx.ras_if, &ih_info);
 free:
        kfree(adev->gfx.ras_if);
+       adev->gfx.ras_if = NULL;
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index f1300d5..ba14955 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -799,8 +799,11 @@ static int gmc_v9_0_ecc_late_init(void *handle)
                r = amdgpu_irq_get(adev, &adev->gmc.ecc_irq, 0);
                if (r)
                        goto umc_late_fini;
-       } else
-               kfree(adev->gmc.umc_ras_if);
+       } else {
+               /* free umc ras_if if umc ras is not supported */
+               r = 0;
+               goto free;
+       }
 
        if (adev->mmhub_funcs && adev->mmhub_funcs->ras_late_init) {
                r = adev->mmhub_funcs->ras_late_init(adev);
@@ -812,6 +815,7 @@ umc_late_fini:
        amdgpu_ras_late_fini(adev, adev->gmc.umc_ras_if, &umc_ih_info);
 free:
        kfree(adev->gmc.umc_ras_if);
+       adev->gmc.umc_ras_if = NULL;
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index ab6559a..9916a33 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -639,8 +639,10 @@ static int mmhub_v1_0_ras_late_init(struct amdgpu_device *adev)
        mmhub_ih_info.head = mmhub_fs_info.head = *adev->gmc.mmhub_ras_if;
        r = amdgpu_ras_late_init(adev, adev->gmc.mmhub_ras_if,
                                 &mmhub_fs_info, &mmhub_ih_info);
-       if (r || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block))
+       if (r || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block)) {
                kfree(adev->gmc.mmhub_ras_if);
+               adev->gmc.mmhub_ras_if = NULL;
+       }
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index 27eeab1..f25c6a9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
@@ -507,6 +507,9 @@ static int nbio_v7_4_ras_late_init(struct amdgpu_device *adev)
                r = amdgpu_irq_get(adev, &adev->nbio.ras_err_event_athub_irq, 0);
                if (r)
                        goto late_fini;
+       } else {
+               r = 0;
+               goto free;
        }
 
        return 0;
@@ -514,6 +517,7 @@ late_fini:
        amdgpu_ras_late_fini(adev, adev->nbio.ras_if, &ih_info);
 free:
        kfree(adev->nbio.ras_if);
+       adev->nbio.ras_if = NULL;
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 4aabb0d..5e759a8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1728,14 +1728,18 @@ static int sdma_v4_0_late_init(void *handle)
                        if (r)
                                goto late_fini;
                }
-       } else
-               kfree(adev->sdma.ras_if);
+       } else {
+               /* free sdma ras_if if sdma ras is not supported */
+               r = 0;
+               goto free;
+       }
 
         return 0;
 late_fini:
        amdgpu_ras_late_fini(adev, adev->sdma.ras_if, &ih_info);
 free:
        kfree(adev->sdma.ras_if);
+       adev->sdma.ras_if = NULL;
        return r;
 }