| From 250ffab3bcb04f1df95d7afb066b3ae9087a3524 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 14 Jun 2020 02:12:29 -0500 |
| Subject: drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms |
| |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| |
| [ Upstream commit 9ba8923cbbe11564dd1bf9f3602add9a9cfbb5c6 ] |
| |
| in amdgpu_driver_open_kms the call to pm_runtime_get_sync increments the |
| counter even in case of failure, leading to incorrect |
| ref count. In case of failure, decrement the ref count before returning. |
| |
| Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c |
| index ab5134d920d96..96fc1566f28e5 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c |
| @@ -543,7 +543,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) |
| |
| r = pm_runtime_get_sync(dev->dev); |
| if (r < 0) |
| - return r; |
| + goto pm_put; |
| |
| fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL); |
| if (unlikely(!fpriv)) { |
| @@ -566,6 +566,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) |
| |
| out_suspend: |
| pm_runtime_mark_last_busy(dev->dev); |
| +pm_put: |
| pm_runtime_put_autosuspend(dev->dev); |
| |
| return r; |
| -- |
| 2.25.1 |
| |
