Commit 659fb5f1 authored by Aditya Pakki's avatar Aditya Pakki Committed by Ben Skeggs
Browse files

drm/nouveau: fix multiple instances of reference count leaks 



On calling pm_runtime_get_sync() the reference count of the device
is incremented. In case of failure, decrement the
ref count before returning the error.

Signed-off-by: default avatarAditya Pakki <pakki001@umn.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent bfad51c7

drivers/gpu/drm/nouveau/nouveau_drm.c

+6 −2
Original line number Diff line number Diff line
@@ -1026,8 +1026,10 @@ nouveau_drm_open(struct drm_device *dev, struct drm_file *fpriv) 


	/* need to bring up power immediately if opening device */

	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;

	}



	get_task_comm(tmpname, current);

	snprintf(name, sizeof(name), "%s[%d]", tmpname, pid_nr(fpriv->pid));
@@ -1109,8 +1111,10 @@ nouveau_drm_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	long ret;



	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;

	}



	switch (_IOC_NR(cmd) - DRM_COMMAND_BASE) {

	case DRM_NOUVEAU_NVIF:

drivers/gpu/drm/nouveau/nouveau_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ nouveau_gem_object_del(struct drm_gem_object *gem) 
	int ret;



	ret = pm_runtime_get_sync(dev);

	if (WARN_ON(ret < 0 && ret != -EACCES))

	if (WARN_ON(ret < 0 && ret != -EACCES)) {

		pm_runtime_put_autosuspend(dev);

		return;

	}



	if (gem->import_attach)

		drm_prime_gem_destroy(gem, nvbo->bo.sg);