]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amdgpu: fix ref count leak in amdgpu_driver_open_kms
authorNavid Emamdoost <navid.emamdoost@gmail.com>
Sun, 14 Jun 2020 07:12:29 +0000 (02:12 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Sep 2020 09:22:25 +0000 (11:22 +0200)
[ 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

index 22d9ec80a2ffdcf23abc92fe15a4bf705661d3f9..b7ee5008b8a2ab213a7f0122e3de3c3a329d3ffd 100644 (file)
@@ -785,7 +785,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)) {
@@ -824,6 +824,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;