drm/amd/pp: Fix memory leak in error path in smumgr

Free the backend structure if we fail to allocate device memory.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
index 957739aa6db99bae9cd8d7ec25b3b80ce00e930d..669c1bef9a5ca36afd8b13c63c9881002358d1c0 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
@@ -764,7 +764,7 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr)
                                &cz_smu->toc_buffer.mc_addr,
                                &cz_smu->toc_buffer.kaddr);
        if (ret)
-               return -EINVAL;
+               goto err2;
 
        ret = amdgpu_bo_create_kernel((struct amdgpu_device *)hwmgr->adev,
                                cz_smu->smu_buffer.data_size,
@@ -773,19 +773,15 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr)
                                &cz_smu->smu_buffer.handle,
                                &cz_smu->smu_buffer.mc_addr,
                                &cz_smu->smu_buffer.kaddr);
-       if (ret) {
-               amdgpu_bo_free_kernel(&cz_smu->toc_buffer.handle,
-                                       &cz_smu->toc_buffer.mc_addr,
-                                       &cz_smu->toc_buffer.kaddr);
-               return -EINVAL;
-       }
+       if (ret)
+               goto err1;
 
        if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
                CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SCRATCH,
                UCODE_ID_RLC_SCRATCH_SIZE_BYTE,
                &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {
                pr_err("Error when Populate Firmware Entry.\n");
-               return -1;
+               goto err0;
        }
 
        if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
@@ -793,14 +789,14 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr)
                UCODE_ID_RLC_SRM_ARAM_SIZE_BYTE,
                &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {
                pr_err("Error when Populate Firmware Entry.\n");
-               return -1;
+               goto err0;
        }
        if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
                CZ_SCRATCH_ENTRY_UCODE_ID_RLC_SRM_DRAM,
                UCODE_ID_RLC_SRM_DRAM_SIZE_BYTE,
                &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {
                pr_err("Error when Populate Firmware Entry.\n");
-               return -1;
+               goto err0;
        }
 
        if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
@@ -808,7 +804,7 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr)
                sizeof(struct SMU8_MultimediaPowerLogData),
                &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {
                pr_err("Error when Populate Firmware Entry.\n");
-               return -1;
+               goto err0;
        }
 
        if (0 != cz_smu_populate_single_scratch_entry(hwmgr,
@@ -816,10 +812,22 @@ static int cz_smu_init(struct pp_hwmgr *hwmgr)
                sizeof(struct SMU8_Fusion_ClkTable),
                &cz_smu->scratch_buffer[cz_smu->scratch_buffer_length++])) {
                pr_err("Error when Populate Firmware Entry.\n");
-               return -1;
+               goto err0;
        }
 
        return 0;
+
+err0:
+       amdgpu_bo_free_kernel(&cz_smu->smu_buffer.handle,
+                               &cz_smu->smu_buffer.mc_addr,
+                               &cz_smu->smu_buffer.kaddr);
+err1:
+       amdgpu_bo_free_kernel(&cz_smu->toc_buffer.handle,
+                               &cz_smu->toc_buffer.mc_addr,
+                               &cz_smu->toc_buffer.kaddr);
+err2:
+       kfree(cz_smu);
+       return -EINVAL;
 }
 
 static int cz_smu_fini(struct pp_hwmgr *hwmgr)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
index ed2e2e9c5715994c1cf73cab2ec7cdf2bb2252ab..95fcda37f890fdb85fb6c2878b3199264c6f3275 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
@@ -354,8 +354,10 @@ static int fiji_smu_init(struct pp_hwmgr *hwmgr)
 
        hwmgr->smu_backend = fiji_priv;
 
-       if (smu7_init(hwmgr))
+       if (smu7_init(hwmgr)) {
+               kfree(fiji_priv);
                return -EINVAL;
+       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
index 6255edf5872161db7836e69d87e9f83965220a84..4e2f62e659ef37ae601d30b7b8538a29c9f5f64f 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
@@ -271,8 +271,10 @@ static int iceland_smu_init(struct pp_hwmgr *hwmgr)
 
        hwmgr->smu_backend = iceland_priv;
 
-       if (smu7_init(hwmgr))
+       if (smu7_init(hwmgr)) {
+               kfree(iceland_priv);
                return -EINVAL;
+       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
index 0609acf9c0f1a40694ffa7ab9656c7e633a66234..03ec1e59876ba3816bbeac1e75565e039c2c0a80 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
@@ -349,8 +349,10 @@ static int polaris10_smu_init(struct pp_hwmgr *hwmgr)
 
        hwmgr->smu_backend = smu_data;
 
-       if (smu7_init(hwmgr))
+       if (smu7_init(hwmgr)) {
+               kfree(smu_data);
                return -EINVAL;
+       }
 
        return 0;
 }

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
index 6f360c378d25842fa45fcabeb639fac430d82028..2d68fae8f1612f341c3c8396c1d688452a2dccd0 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
@@ -347,7 +347,7 @@ static int rv_smu_init(struct pp_hwmgr *hwmgr)
                        &priv->smu_tables.entry[WMTABLE].table);
 
        if (r)
-               return -EINVAL;
+               goto err0;
 
        priv->smu_tables.entry[WMTABLE].version = 0x01;
        priv->smu_tables.entry[WMTABLE].size = sizeof(Watermarks_t);
@@ -363,18 +363,22 @@ static int rv_smu_init(struct pp_hwmgr *hwmgr)
                        &priv->smu_tables.entry[CLOCKTABLE].mc_addr,
                        &priv->smu_tables.entry[CLOCKTABLE].table);
 
-       if (r) {
-               amdgpu_bo_free_kernel(&priv->smu_tables.entry[WMTABLE].handle,
-                                       &priv->smu_tables.entry[WMTABLE].mc_addr,
-                                       &priv->smu_tables.entry[WMTABLE].table);
-               return -EINVAL;
-       }
+       if (r)
+               goto err1;
 
        priv->smu_tables.entry[CLOCKTABLE].version = 0x01;
        priv->smu_tables.entry[CLOCKTABLE].size = sizeof(DpmClocks_t);
        priv->smu_tables.entry[CLOCKTABLE].table_id = TABLE_DPMCLOCKS;
 
        return 0;
+
+err1:
+       amdgpu_bo_free_kernel(&priv->smu_tables.entry[WMTABLE].handle,
+                               &priv->smu_tables.entry[WMTABLE].mc_addr,
+                               &priv->smu_tables.entry[WMTABLE].table);
+err0:
+       kfree(priv);
+       return -EINVAL;
 }
 
 const struct pp_smumgr_func rv_smu_funcs = {

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
index 39d6f4ef96ce23a7b2f7e32ed3b47ece5b1c2920..26cca8cce8f13e507b71771cdd8eced6ce6a0071 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
@@ -229,8 +229,10 @@ static int tonga_smu_init(struct pp_hwmgr *hwmgr)
 
        hwmgr->smu_backend = tonga_priv;
 
-       if (smu7_init(hwmgr))
+       if (smu7_init(hwmgr)) {
+               kfree(tonga_priv);
                return -EINVAL;
+       }
 
        return 0;
 }