]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/virtio: Correct drm_gem_shmem_get_sg_table() error handling
authorDmitry Osipenko <dmitry.osipenko@collabora.com>
Thu, 30 Jun 2022 20:07:18 +0000 (23:07 +0300)
committerGerd Hoffmann <kraxel@redhat.com>
Tue, 19 Jul 2022 12:40:57 +0000 (14:40 +0200)
Previous commit fixed checking of the ERR_PTR value returned by
drm_gem_shmem_get_sg_table(), but it missed to zero out the shmem->pages,
which will crash virtio_gpu_cleanup_object(). Add the missing zeroing of
the shmem->pages.

Fixes: 35ba78ff2b61 ("drm/virtio: Fix NULL vs IS_ERR checking in virtio_gpu_object_shmem_init")
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20220630200726.1884320-2-dmitry.osipenko@collabora.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
drivers/gpu/drm/virtio/virtgpu_object.c

index 1cc8f3fc8e4ba2951c093f813fab4bdf02aeae7d..87b19b3b96e0ba6ec356f953a9977a4d1409dcdc 100644 (file)
@@ -170,6 +170,7 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev,
        shmem->pages = drm_gem_shmem_get_sg_table(&bo->base);
        if (IS_ERR(shmem->pages)) {
                drm_gem_shmem_unpin(&bo->base);
+               shmem->pages = NULL;
                return PTR_ERR(shmem->pages);
        }