]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/virtio: Fix double free on probe failure
authorXie Yongji <xieyongji@bytedance.com>
Mon, 17 May 2021 08:49:12 +0000 (16:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:22:37 +0000 (16:22 +0200)
[ Upstream commit cec7f1774605a5ef47c134af62afe7c75c30b0ee ]

The virtio_gpu_init() will free vgdev and vgdev->vbufs on failure.
But such failure will be caught by virtio_gpu_probe() and then
virtio_gpu_release() will be called to do some cleanup which
will free vgdev and vgdev->vbufs again. So let's set dev->dev_private
to NULL to avoid double free.

Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210517084913.403-2-xieyongji@bytedance.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/virtio/virtgpu_kms.c

index 476b9993b0682a7d90ae729b8c65b9588c365b1b..44f9762e86e88b04873ca54117b4fe7e994adb29 100644 (file)
@@ -233,6 +233,7 @@ err_ttm:
 err_vbufs:
        vgdev->vdev->config->del_vqs(vgdev->vdev);
 err_vqs:
+       dev->dev_private = NULL;
        kfree(vgdev);
        return ret;
 }