Unverified Commit 3c6f6934 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11072 drm/virtio: Fix GEM handle creation UAF 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/K5J3Z5YAYIV4IUON4E26CHK3QSSIV25Y/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALIA1 
 
Link:https://gitee.com/openeuler/kernel/pulls/11072

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 58e48128 48030fc4

drivers/gpu/drm/virtio/virtgpu_ioctl.c

+9 −1
Original line number Diff line number Diff line
@@ -309,7 +309,6 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
		}

		return ret;

	}

	drm_gem_object_put_unlocked(obj);



	rc->res_handle = res_id; /* similiar to a VM address */

	rc->bo_handle = handle;
@@ -318,6 +317,15 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, 
		virtio_gpu_unref_list(&validate_list);

		dma_fence_put(&fence->f);

	}



	/*

	 * The handle owns the reference now.  But we must drop our

	 * remaining reference *after* we no longer need to dereference

	 * the obj.  Otherwise userspace could guess the handle and

	 * race closing it from another thread.

	 */

	drm_gem_object_put_unlocked(obj);



	return 0;

fail_unref:

	if (vgdev->has_virgl_3d) {