diff options
| author |   Aditya Pakki <pakki001@umn.edu> | 2020-06-13 20:41:56 -0500 |
|---|---|---|
| committer |   Ben Skeggs <bskeggs@redhat.com> | 2020-07-24 18:50:49 +1000 |
| commit | 659fb5f154c3434c90a34586f3b7aa1c39cf6062 (patch) | |
| tree | e8e078c29a4c08f5a0f3f7b543a78f4d3d3b53ba /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | drm/nouveau/drm/noveau: fix reference count leak in nouveau_fbcon_open (diff) | |
| download | wireguard-linux-659fb5f154c3434c90a34586f3b7aa1c39cf6062.tar.xz wireguard-linux-659fb5f154c3434c90a34586f3b7aa1c39cf6062.zip | |
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: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index ac93d12201dc..880d962c1b19 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -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: |