[PATCH 4/7] drm/amd/ras: fix memory leak on ras sw_init failure

[YiPeng Chai]

Fix memory leak on ras sw_init failure.

Signed-off-by: YiPeng Chai <yipeng.c...@amd.com>
---
 .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c 
b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
index 3a819c89e2fd..cf6ce21fb4dc 100644
--- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
+++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c
@@ -307,13 +307,17 @@ static int amdgpu_ras_mgr_sw_init(struct amdgpu_ip_block 
*ip_block)
        if (!ras_mgr->ras_core) {
                RAS_DEV_ERR(adev, "Failed to create ras core!\n");
                ret = -EINVAL;
-               goto err;
+               goto err1;
        }
 
        ras_mgr->ras_core->dev = adev;
 
        amdgpu_ras_process_init(adev);
-       ras_core_sw_init(ras_mgr->ras_core);
+       ret = ras_core_sw_init(ras_mgr->ras_core);
+       if (ret) {
+               RAS_DEV_ERR(adev, "ras_core_sw_init failed! ret:%d\n", ret);
+               goto err2;
+       }
        amdgpu_ras_mgr_init_event_mgr(ras_mgr->ras_core);
 
        if (amdgpu_sriov_vf(adev)) {
@@ -321,14 +325,22 @@ static int amdgpu_ras_mgr_sw_init(struct amdgpu_ip_block 
*ip_block)
                if (ret) {
                        RAS_DEV_ERR(adev,
                                "Virt ras sw_init failed! ret:%d\n", ret);
-                       goto err;
+                       goto err3;
                }
        }
 
        return 0;
 
-err:
+err3:
+       if (ras_mgr->ras_core)
+               ras_core_sw_fini(ras_mgr->ras_core);
+err2:
+       amdgpu_ras_process_fini(adev);
+       if (ras_mgr->ras_core)
+               ras_core_destroy(ras_mgr->ras_core);
+err1:
        kfree(ras_mgr);
+       con->ras_mgr = NULL;
        return ret;
 }
 
-- 
2.43.0