| From 42ae541c194a5cc2f410d81fbfcffe83aef8fef9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 13 Jun 2020 20:22:23 -0500 |
| Subject: drm/nouveau: Fix reference count leak in nouveau_connector_detect |
| |
| From: Aditya Pakki <pakki001@umn.edu> |
| |
| [ Upstream commit 990a1162986e8eff7ca18cc5a0e03b4304392ae2 ] |
| |
| nouveau_connector_detect() 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/nouveau_connector.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c |
| index 5bfae1f972c74..0061deca290a4 100644 |
| --- a/drivers/gpu/drm/nouveau/nouveau_connector.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c |
| @@ -281,8 +281,10 @@ nouveau_connector_detect(struct drm_connector *connector, bool force) |
| pm_runtime_get_noresume(dev->dev); |
| } else { |
| ret = pm_runtime_get_sync(dev->dev); |
| - if (ret < 0 && ret != -EACCES) |
| + if (ret < 0 && ret != -EACCES) { |
| + pm_runtime_put_autosuspend(dev->dev); |
| return conn_status; |
| + } |
| } |
| |
| nv_encoder = nouveau_connector_ddc_detect(connector); |
| -- |
| 2.25.1 |
| |
