]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/nouveau: fix reference count leak in nv50_disp_atomic_commit
authorAditya Pakki <pakki001@umn.edu>
Sun, 14 Jun 2020 01:29:18 +0000 (20:29 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Sep 2020 09:29:21 +0000 (11:29 +0200)
[ Upstream commit a2cdf39536b0d21fb06113f5e16692513d7bcb9c ]

nv50_disp_atomic_commit() calls calls pm_runtime_get_sync and in turn
increments the reference count. In case of failure, decrement the
ref count before returning the error.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/nouveau/dispnv50/disp.c

index 800b7757252e3c92a97af405dc2d34f245a652da..d2c2d102e732963823f88ac9a0997598a460add8 100644 (file)
@@ -2160,8 +2160,10 @@ nv50_disp_atomic_commit(struct drm_device *dev,
        int ret, i;
 
        ret = pm_runtime_get_sync(dev->dev);
-       if (ret < 0 && ret != -EACCES)
+       if (ret < 0 && ret != -EACCES) {
+               pm_runtime_put_autosuspend(dev->dev);
                return ret;
+       }
 
        ret = drm_atomic_helper_setup_commit(state, nonblock);
        if (ret)