diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2009-07-13 23:20:21 +0200 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-07-15 15:56:12 +1000 |
commit | 845792d940f5755b7a7837c450a71d9e831a13e2 (patch) | |
tree | 92b4aee24f19c6522e17e2b2b026ea1128389c93 /drivers/gpu/drm/drm_gem.c | |
parent | d25e3a6faa82eeaa6e5487c2d2e27cfd938ed108 (diff) | |
download | linux-3.10-845792d940f5755b7a7837c450a71d9e831a13e2.tar.gz linux-3.10-845792d940f5755b7a7837c450a71d9e831a13e2.tar.bz2 linux-3.10-845792d940f5755b7a7837c450a71d9e831a13e2.zip |
drm: drm_gem, check kzalloc retval
Check kzalloc retval against NULL in drm_gem_object_alloc and bail out
appropriately.
While at it merge the fail paths and jump to them by gotos at the end
of the function.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
-rw-r--r-- | drivers/gpu/drm/drm_gem.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 8104ecaea26..ffe8f4394d5 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -134,26 +134,29 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size) BUG_ON((size & (PAGE_SIZE - 1)) != 0); obj = kzalloc(sizeof(*obj), GFP_KERNEL); + if (!obj) + goto free; obj->dev = dev; obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE); - if (IS_ERR(obj->filp)) { - kfree(obj); - return NULL; - } + if (IS_ERR(obj->filp)) + goto free; kref_init(&obj->refcount); kref_init(&obj->handlecount); obj->size = size; if (dev->driver->gem_init_object != NULL && dev->driver->gem_init_object(obj) != 0) { - fput(obj->filp); - kfree(obj); - return NULL; + goto fput; } atomic_inc(&dev->object_count); atomic_add(obj->size, &dev->object_memory); return obj; +fput: + fput(obj->filp); +free: + kfree(obj); + return NULL; } EXPORT_SYMBOL(drm_gem_object_alloc); |