lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 257/779] drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit c24968734abfed81c8f93dc5f44a7b7a9aecadfa ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/virtio/virtgpu_object.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
    index 187e10da2f17..9af9f355e0a7 100644
    --- a/drivers/gpu/drm/virtio/virtgpu_object.c
    +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
    @@ -167,9 +167,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) {
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 20:51    [W:4.031 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site