]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amdgpu/debugfs: fix memory leak when pm_runtime_get_sync failed
authorChen Tao <chentao107@huawei.com>
Wed, 17 Jun 2020 10:51:29 +0000 (18:51 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 11:15:04 +0000 (13:15 +0200)
[ Upstream commit 3e4aeff36e9212a939290c0ca70d4931c4ad1950 ]

Fix memory leak in amdgpu_debugfs_gpr_read not freeing data when
pm_runtime_get_sync failed.

Fixes: a9ffe2a983383 ("drm/amdgpu/debugfs: properly handle runtime pm")
Signed-off-by: Chen Tao <chentao107@huawei.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c

index f87b225437fc34ed1b1356b20a6de2a426f54e28..bd5061fbe031e2e2705803ece677dc82d714c192 100644 (file)
@@ -973,7 +973,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,
 
        r = pm_runtime_get_sync(adev->ddev->dev);
        if (r < 0)
-               return r;
+               goto err;
 
        r = amdgpu_virt_enable_access_debugfs(adev);
        if (r < 0)
@@ -1003,7 +1003,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,
                value = data[result >> 2];
                r = put_user(value, (uint32_t *)buf);
                if (r) {
-                       result = r;
+                       amdgpu_virt_disable_access_debugfs(adev);
                        goto err;
                }
 
@@ -1012,11 +1012,14 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf,
                size -= 4;
        }
 
-err:
-       pm_runtime_put_autosuspend(adev->ddev->dev);
        kfree(data);
        amdgpu_virt_disable_access_debugfs(adev);
        return result;
+
+err:
+       pm_runtime_put_autosuspend(adev->ddev->dev);
+       kfree(data);
+       return r;
 }
 
 /**