Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 845792d9 authored by Jiri Slaby's avatar Jiri Slaby Committed by Dave Airlie
Browse files

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: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent d25e3a6f

drivers/gpu/drm/drm_gem.c

+10 −7
Original line number Diff line number Diff line
@@ -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);