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

nouveau_fbcon_open() calls calls pm_runtime_get_sync() that
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/nouveau_fbcon.c

index edb3a23ded5d5e9e384a573d37e0bea32a1beb1b..11183839f6fad1776e4624f6a9411f8c63bf6402 100644 (file)
@@ -184,8 +184,10 @@ nouveau_fbcon_open(struct fb_info *info, int user)
        struct nouveau_fbdev *fbcon = info->par;
        struct nouveau_drm *drm = nouveau_drm(fbcon->dev);
        int ret = pm_runtime_get_sync(drm->dev->dev);
-       if (ret < 0 && ret != -EACCES)
+       if (ret < 0 && ret != -EACCES) {
+               pm_runtime_put(drm->dev->dev);
                return ret;
+       }
        return 0;
 }