Commit e473216b authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Gerd Hoffmann
Browse files

drm/virtio: Check whether transferred 2D BO is shmem 



Transferred 2D BO always must be a shmem BO. Add check for that to prevent
NULL dereference if userspace passes a VRAM BO.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220630200726.1884320-3-dmitry.osipenko@collabora.com


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 64b88afb

drivers/gpu/drm/virtio/virtgpu_vq.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ void virtio_gpu_cmd_transfer_to_host_2d(struct virtio_gpu_device *vgdev, 
	bool use_dma_api = !virtio_has_dma_quirk(vgdev->vdev);

	struct virtio_gpu_object_shmem *shmem = to_virtio_gpu_shmem(bo);



	if (use_dma_api)

	if (virtio_gpu_is_shmem(bo) && use_dma_api)

		dma_sync_sgtable_for_device(vgdev->vdev->dev.parent,

					    shmem->pages, DMA_TO_DEVICE);