| From 8bb81d67c1982cce30135b3e708b3b6f3e58dc22 Mon Sep 17 00:00:00 2001 |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Date: Tue, 1 Oct 2019 22:46:07 -0500 |
| Subject: [PATCH] drm/amdgpu: fix multiple memory leaks in acp_hw_init |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 57be09c6e8747bf48704136d9e3f92bfb93f5725 upstream. |
| |
| In acp_hw_init there are some allocations that needs to be released in |
| case of failure: |
| |
| 1- adev->acp.acp_genpd should be released if any allocation attemp for |
| adev->acp.acp_cell, adev->acp.acp_res or i2s_pdata fails. |
| 2- all of those allocations should be released if |
| mfd_add_hotplug_devices or pm_genpd_add_device fail. |
| 3- Release is needed in case of time out values expire. |
| |
| Reviewed-by: Christian Kรถnig <christian.koenig@amd.com> |
| Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c |
| index 0a4fba196b84..7f3538710d1f 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c |
| @@ -188,7 +188,7 @@ static int acp_hw_init(void *handle) |
| u32 val = 0; |
| u32 count = 0; |
| struct device *dev; |
| - struct i2s_platform_data *i2s_pdata; |
| + struct i2s_platform_data *i2s_pdata = NULL; |
| |
| struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
| |
| @@ -230,20 +230,21 @@ static int acp_hw_init(void *handle) |
| adev->acp.acp_cell = kcalloc(ACP_DEVS, sizeof(struct mfd_cell), |
| GFP_KERNEL); |
| |
| - if (adev->acp.acp_cell == NULL) |
| - return -ENOMEM; |
| + if (adev->acp.acp_cell == NULL) { |
| + r = -ENOMEM; |
| + goto failure; |
| + } |
| |
| adev->acp.acp_res = kcalloc(5, sizeof(struct resource), GFP_KERNEL); |
| if (adev->acp.acp_res == NULL) { |
| - kfree(adev->acp.acp_cell); |
| - return -ENOMEM; |
| + r = -ENOMEM; |
| + goto failure; |
| } |
| |
| i2s_pdata = kcalloc(3, sizeof(struct i2s_platform_data), GFP_KERNEL); |
| if (i2s_pdata == NULL) { |
| - kfree(adev->acp.acp_res); |
| - kfree(adev->acp.acp_cell); |
| - return -ENOMEM; |
| + r = -ENOMEM; |
| + goto failure; |
| } |
| |
| switch (adev->asic_type) { |
| @@ -340,14 +341,14 @@ static int acp_hw_init(void *handle) |
| r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell, |
| ACP_DEVS); |
| if (r) |
| - return r; |
| + goto failure; |
| |
| for (i = 0; i < ACP_DEVS ; i++) { |
| dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i); |
| r = pm_genpd_add_device(&adev->acp.acp_genpd->gpd, dev); |
| if (r) { |
| dev_err(dev, "Failed to add dev to genpd\n"); |
| - return r; |
| + goto failure; |
| } |
| } |
| |
| @@ -366,7 +367,8 @@ static int acp_hw_init(void *handle) |
| break; |
| if (--count == 0) { |
| dev_err(&adev->pdev->dev, "Failed to reset ACP\n"); |
| - return -ETIMEDOUT; |
| + r = -ETIMEDOUT; |
| + goto failure; |
| } |
| udelay(100); |
| } |
| @@ -383,7 +385,8 @@ static int acp_hw_init(void *handle) |
| break; |
| if (--count == 0) { |
| dev_err(&adev->pdev->dev, "Failed to reset ACP\n"); |
| - return -ETIMEDOUT; |
| + r = -ETIMEDOUT; |
| + goto failure; |
| } |
| udelay(100); |
| } |
| @@ -392,6 +395,13 @@ static int acp_hw_init(void *handle) |
| val &= ~ACP_SOFT_RESET__SoftResetAud_MASK; |
| cgs_write_register(adev->acp.cgs_device, mmACP_SOFT_RESET, val); |
| return 0; |
| + |
| +failure: |
| + kfree(i2s_pdata); |
| + kfree(adev->acp.acp_res); |
| + kfree(adev->acp.acp_cell); |
| + kfree(adev->acp.acp_genpd); |
| + return r; |
| } |
| |
| /** |
| -- |
| 2.7.4 |
| |