| From 294603e16651f0a6c1837de7d5bcc374c7420f70 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 13 Jun 2020 20:33:42 -0500 |
| Subject: drm/nouveau/drm/noveau: fix reference count leak in |
| nouveau_fbcon_open |
| |
| From: Aditya Pakki <pakki001@umn.edu> |
| |
| [ 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 | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c |
| index 275abc424ce25..40da9143f7220 100644 |
| --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c |
| @@ -183,8 +183,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; |
| } |
| |
| -- |
| 2.25.1 |
| |
