diff options
| author | Miaoqian Lin <linmq006@gmail.com> | 2022-06-02 14:42:22 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-03 11:44:51 +0100 |
| commit | 0a4181b23acf53e9c95b351df6a7891116b98f9b (patch) | |
| tree | 4ca04a8e2695508c9b5aa6c557aa2c849a3e88d4 | |
| parent | a401ef0557da5b7f5b9c4baf0d861b33883d9228 (diff) | |
| download | linux-stable-0a4181b23acf53e9c95b351df6a7891116b98f9b.tar.gz linux-stable-0a4181b23acf53e9c95b351df6a7891116b98f9b.tar.bz2 linux-stable-0a4181b23acf53e9c95b351df6a7891116b98f9b.zip | |
drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init
commit c24968734abfed81c8f93dc5f44a7b7a9aecadfa upstream.
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: 2f2aa13724d5 ("drm/virtio: move virtio_gpu_mem_entry initialization to new function")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220602104223.54527-1-linmq006@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index 0c98978e2e55..d4fab3361d2c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -157,9 +157,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.base); - if (!shmem->pages) { + if (IS_ERR(shmem->pages)) { drm_gem_shmem_unpin(&bo->base.base); - return -EINVAL; + return PTR_ERR(shmem->pages); } if (use_dma_api) { |