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

Commit 2e07fb22 authored by YoungJun Cho's avatar YoungJun Cho Committed by Dave Airlie
Browse files

drm/gem: fix not to assign error value to gem name 



If idr_alloc() is failed, obj->name can be error value. Also
it cleans up duplicated flink processing code.

This regression has been introduced in

commit 2e928815
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Feb 27 17:04:08 2013 -0800

    drm: convert to idr_alloc()

Signed-off-by: default avatarYoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4368dd84

drivers/gpu/drm/drm_gem.c

+7 −11
Original line number Diff line number Diff line
@@ -453,25 +453,21 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data, 
	spin_lock(&dev->object_name_lock);

	if (!obj->name) {

		ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_NOWAIT);

		obj->name = ret;

		args->name = (uint64_t) obj->name;

		spin_unlock(&dev->object_name_lock);

		idr_preload_end();



		if (ret < 0)

			goto err;

		ret = 0;



		obj->name = ret;



		/* Allocate a reference for the name table.  */

		drm_gem_object_reference(obj);

	} else {

	}



	args->name = (uint64_t) obj->name;

		spin_unlock(&dev->object_name_lock);

		idr_preload_end();

	ret = 0;

	}



err:

	spin_unlock(&dev->object_name_lock);

	idr_preload_end();

	drm_gem_object_unreference_unlocked(obj);

	return ret;

}