Aditya Pakki
2020-Jun-14  01:29 UTC
[Nouveau] [PATCH] drm/noveau: fix reference count leak in nv50_disp_atomic_commit
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 at umn.edu>
---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index d472942102f5..b4039907f0d6 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -2157,8 +2157,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)
-- 
2.25.1
Lyude Paul
2020-Jun-18  15:18 UTC
[Nouveau] [PATCH] drm/noveau: fix reference count leak in nv50_disp_atomic_commit
On Sat, 2020-06-13 at 20:29 -0500, Aditya Pakki wrote:> 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 at umn.edu> > --- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c > b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index d472942102f5..b4039907f0d6 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -2157,8 +2157,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);s/noveau/nouveau/ in the commit title, but other than that: Reviewed-by: Lyude Paul <lyude at redhat.com>> return ret; > + } > > ret = drm_atomic_helper_setup_commit(state, nonblock); > if (ret)
Reasonably Related Threads
- [PATCH] drm/noveau: fix reference count leak in nv50_disp_atomic_commit
- [PATCH] drm/noveau: fix reference count leak in nouveau_debugfs_strap_peek
- [PATCH AUTOSEL 5.8 49/62] drm/nouveau: fix reference count leak in nv50_disp_atomic_commit
- [PATCH AUTOSEL 5.7 48/61] drm/nouveau: fix reference count leak in nv50_disp_atomic_commit
- [PATCH AUTOSEL 5.4 37/48] drm/nouveau: fix reference count leak in nv50_disp_atomic_commit