| From d1ea6490b2d5e5833a29c16aa08830ee15491ab0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 14 Jun 2020 02:14:50 -0500 |
| Subject: drm/amd/display: fix ref count leak in amdgpu_drm_ioctl |
| |
| From: Navid Emamdoost <navid.emamdoost@gmail.com> |
| |
| [ Upstream commit 5509ac65f2fe5aa3c0003237ec629ca55024307c ] |
| |
| in amdgpu_drm_ioctl 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_drv.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |
| index e0890deccb2fe..7cae10fec78de 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |
| @@ -633,11 +633,12 @@ long amdgpu_drm_ioctl(struct file *filp, |
| dev = file_priv->minor->dev; |
| ret = pm_runtime_get_sync(dev->dev); |
| if (ret < 0) |
| - return ret; |
| + goto out; |
| |
| ret = drm_ioctl(filp, cmd, arg); |
| |
| pm_runtime_mark_last_busy(dev->dev); |
| +out: |
| pm_runtime_put_autosuspend(dev->dev); |
| return ret; |
| } |
| -- |
| 2.25.1 |
| |
