| From 3b7623933cf82bd5402660e69402d4b33d126771 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 13 Jun 2020 20:48:37 -0500 |
| Subject: drm/nouveau: fix reference count leak in nouveau_debugfs_strap_peek |
| |
| From: Aditya Pakki <pakki001@umn.edu> |
| |
| [ Upstream commit 8f29432417b11039ef960ab18987c7d61b2b5396 ] |
| |
| nouveau_debugfs_strap_peek() 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_debugfs.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c |
| index 15a3d40edf029..3e15a9d5e8faa 100644 |
| --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c |
| @@ -54,8 +54,10 @@ nouveau_debugfs_strap_peek(struct seq_file *m, void *data) |
| int ret; |
| |
| ret = pm_runtime_get_sync(drm->dev->dev); |
| - if (ret < 0 && ret != -EACCES) |
| + if (ret < 0 && ret != -EACCES) { |
| + pm_runtime_put_autosuspend(drm->dev->dev); |
| return ret; |
| + } |
| |
| seq_printf(m, "0x%08x\n", |
| nvif_rd32(&drm->client.device.object, 0x101000)); |
| -- |
| 2.25.1 |
| |
