From: Miaoqian Lin Date: Thu, 2 Jun 2022 10:42:22 +0000 (+0400) Subject: drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init X-Git-Tag: baikal/mips/sdk6.1~5152^2~21^2~49 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=00f2057fb9b1ed189e51c8704920973d5260a77b;p=kernel.git drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init Since drm_prime_pages_to_sg() function return error pointers. The drm_gem_shmem_get_sg_table() function returns error pointers too. Using IS_ERR() to check the return value to fix this. Fixes: e09df06efbe1 ("drm/virtio: move virtio_gpu_mem_entry initialization to new function") Signed-off-by: Miaoqian Lin Link: http://patchwork.freedesktop.org/patch/msgid/20220602104223.54527-1-linmq006@gmail.com Signed-off-by: Gerd Hoffmann --- diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index f293e6ad52daf..1cc8f3fc8e4ba 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -168,9 +168,9 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev, * since virtio_gpu doesn't support dma-buf import from other devices. */ shmem->pages = drm_gem_shmem_get_sg_table(&bo->base); - if (!shmem->pages) { + if (IS_ERR(shmem->pages)) { drm_gem_shmem_unpin(&bo->base); - return -EINVAL; + return PTR_ERR(shmem->pages); } if (use_dma_api) {