redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/nouveau: fix some error-path leaks in fbcon handling code

Browse source 
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Maarten Lankhorst 2013-07-08 14:50:54 +10:00 committed by Ben Skeggs
parent 060810d7ab
commit fdfb833265
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpu/drm/nouveau/nouveau_display.c
View file

@ -138,7 +138,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
{ {
struct nouveau_framebuffer *nouveau_fb; struct nouveau_framebuffer *nouveau_fb;
struct drm_gem_object *gem; struct drm_gem_object *gem;
int ret; int ret = -ENOMEM;
gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
if (!gem) if (!gem)
@ -146,15 +146,19 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
nouveau_fb = kzalloc(sizeof(struct nouveau_framebuffer), GFP_KERNEL); nouveau_fb = kzalloc(sizeof(struct nouveau_framebuffer), GFP_KERNEL);
if (!nouveau_fb) if (!nouveau_fb)
return ERR_PTR(-ENOMEM); goto err_unref;
ret = nouveau_framebuffer_init(dev, nouveau_fb, mode_cmd, nouveau_gem_object(gem)); ret = nouveau_framebuffer_init(dev, nouveau_fb, mode_cmd, nouveau_gem_object(gem));
if (ret) { if (ret)
drm_gem_object_unreference(gem); goto err;
return ERR_PTR(ret);
}
return &nouveau_fb->base; 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 = { static const struct drm_mode_config_funcs nouveau_mode_config_funcs = {

1
drivers/gpu/drm/nouveau/nouveau_fbcon.c
View file

@ -385,6 +385,7 @@ out_unlock:
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
if (chan) if (chan)
nouveau_bo_vma_del(nvbo, &fbcon->nouveau_fb.vma); nouveau_bo_vma_del(nvbo, &fbcon->nouveau_fb.vma);
nouveau_bo_unmap(nvbo);
out_unpin: out_unpin:
nouveau_bo_unpin(nvbo); nouveau_bo_unpin(nvbo);
out_unref: out_unref: