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

Commit 6984128d authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm: Balance error path for GEM handle allocation 



The current error path for failure when establishing a handle for a GEM
object is unbalance, e.g. we call object_close() without calling first
object_open(). Use the typical onion structure to only undo what has
been set up prior to the error.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3a848662

drivers/gpu/drm/drm_gem.c

+17 −12
Original line number Diff line number Diff line
@@ -343,27 +343,32 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, 
	spin_unlock(&file_priv->table_lock);

	idr_preload_end();

	mutex_unlock(&dev->object_name_lock);

	if (ret < 0) {

		drm_gem_object_handle_unreference_unlocked(obj);

		return ret;

	}

	if (ret < 0)

		goto err_unref;



	*handlep = ret;



	ret = drm_vma_node_allow(&obj->vma_node, file_priv->filp);

	if (ret) {

		drm_gem_handle_delete(file_priv, *handlep);

		return ret;

	}

	if (ret)

		goto err_remove;



	if (dev->driver->gem_open_object) {

		ret = dev->driver->gem_open_object(obj, file_priv);

		if (ret) {

			drm_gem_handle_delete(file_priv, *handlep);

			return ret;

		}

		if (ret)

			goto err_revoke;

	}



	return 0;



err_revoke:

	drm_vma_node_revoke(&obj->vma_node, file_priv->filp);

err_remove:

	spin_lock(&file_priv->table_lock);

	idr_remove(&file_priv->object_idr, *handlep);

	spin_unlock(&file_priv->table_lock);

err_unref:

	drm_gem_object_handle_unreference_unlocked(obj);

	return ret;

}



/**