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

Commit 4677f15c authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm/ttm: Fix an oops and sync object leak. 



The code was potentially dereferencig a NULL sync object pointer.
At the same time a sync object reference was potentially leaked.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7a50f01a

drivers/gpu/drm/ttm/ttm_bo_util.c

+4 −2
Original line number Diff line number Diff line
@@ -509,8 +509,8 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 
	if (evict) {

		ret = ttm_bo_wait(bo, false, false, false);

		spin_unlock(&bo->lock);

		driver->sync_obj_unref(&bo->sync_obj);



		if (tmp_obj)

			driver->sync_obj_unref(&tmp_obj);

		if (ret)

			return ret;
@@ -532,6 +532,8 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 


		set_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags);

		spin_unlock(&bo->lock);

		if (tmp_obj)

			driver->sync_obj_unref(&tmp_obj);



		ret = ttm_buffer_object_transfer(bo, &ghost_obj);

		if (ret)