mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/virtio: fix possible leak/unlock virtio_gpu_object_array

Browse source 
virtio_gpu_object array is not freed or unlocked in some
failed cases.

Signed-off-by: xndcn <xndchn@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210305151819.14330-1-xndchn@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
xndcn 2021-03-05 23:18:19 +08:00 committed by Gerd Hoffmann
parent edf2085917
commit 377f8331d0
2 changed files with 2 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/virtio/virtgpu_ioctl.c
View file

@ -174,7 +174,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
if (!sync_file) { if (!sync_file) {
dma_fence_put(&out_fence->f); dma_fence_put(&out_fence->f);
ret = -ENOMEM; ret = -ENOMEM;
goto out_memdup; goto out_unresv;
} }
exbuf->fence_fd = out_fence_fd; exbuf->fence_fd = out_fence_fd;

1
drivers/gpu/drm/virtio/virtgpu_object.c
View file

@ -248,6 +248,7 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,
ret = virtio_gpu_object_shmem_init(vgdev, bo, &ents, &nents); ret = virtio_gpu_object_shmem_init(vgdev, bo, &ents, &nents);
if (ret != 0) { if (ret != 0) {
virtio_gpu_array_put_free(objs);
virtio_gpu_free_object(&shmem_obj->base); virtio_gpu_free_object(&shmem_obj->base);
return ret; return ret;
} }