lkml.org 
[lkml]   [2022]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 01/15] drm/virtio: Correct drm_gem_shmem_get_sg_table() error handling
    Date
    drm_gem_shmem_get_sg_table() never ever returned NULL on error. Correct
    the error handling to avoid crash on OOM.

    Cc: stable@vger.kernel.org
    Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
    Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
    ---
    drivers/gpu/drm/virtio/virtgpu_object.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c
    index f293e6ad52da..3d0c8d4d1c20 100644
    --- a/drivers/gpu/drm/virtio/virtgpu_object.c
    +++ b/drivers/gpu/drm/virtio/virtgpu_object.c
    @@ -168,9 +168,11 @@ 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) {
    + ret = PTR_ERR_OR_ZERO(shmem->pages);
    + if (ret) {
    drm_gem_shmem_unpin(&bo->base);
    - return -EINVAL;
    + shmem->pages = NULL;
    + return ret;
    }

    if (use_dma_api) {
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-04-18 00:38    [W:7.439 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site