diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-07-08 14:50:54 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-29 13:08:17 +1000 |
| commit | 8136f1a3bee721e346b170b09f289811de311116 (patch) | |
| tree | 2cf42e477175b884309007bb2f78b356c95e7d3e | |
| parent | dd914b8e12bce5b0a711b5331805667bf1ca9b50 (diff) | |
drm: fix some error-path leaks in fbcon handling code
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau_display.c | 16 | ||||
| -rw-r--r-- | drm/nouveau_fbcon.c | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/drm/nouveau_display.c b/drm/nouveau_display.c index 61fdef8e..907d20ef 100644 --- a/drm/nouveau_display.c +++ b/drm/nouveau_display.c @@ -138,7 +138,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev, { struct nouveau_framebuffer *nouveau_fb; struct drm_gem_object *gem; - int ret; + int ret = -ENOMEM; gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); if (!gem) @@ -146,15 +146,19 @@ nouveau_user_framebuffer_create(struct drm_device *dev, nouveau_fb = kzalloc(sizeof(struct nouveau_framebuffer), GFP_KERNEL); if (!nouveau_fb) - return ERR_PTR(-ENOMEM); + goto err_unref; ret = nouveau_framebuffer_init(dev, nouveau_fb, mode_cmd, nouveau_gem_object(gem)); - if (ret) { - drm_gem_object_unreference(gem); - return ERR_PTR(ret); - } + if (ret) + goto err; return &nouveau_fb->base; + +err: + kfree(nouveau_fb); +err_unref: + drm_gem_object_unreference(gem); + return ERR_PTR(ret); } static const struct drm_mode_config_funcs nouveau_mode_config_funcs = { diff --git a/drm/nouveau_fbcon.c b/drm/nouveau_fbcon.c index 93520100..4c1bc061 100644 --- a/drm/nouveau_fbcon.c +++ b/drm/nouveau_fbcon.c @@ -385,6 +385,7 @@ out_unlock: mutex_unlock(&dev->struct_mutex); if (chan) nouveau_bo_vma_del(nvbo, &fbcon->nouveau_fb.vma); + nouveau_bo_unmap(nvbo); out_unpin: nouveau_bo_unpin(nvbo); out_unref: |