drm/virtio: unlock object array on errors

We don't propagate erros to the callers.  We have to unlock object
arrays on errors.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20200205181955.202485-6-olvaffe@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c
index 7fb09fc4f6a3bbeb9b836a890522b445247d3ac0..0ceceb39f6a42624d18f483be68a5f8e61a7d7f5 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_vq.c
+++ b/drivers/gpu/drm/virtio/virtgpu_vq.c
@@ -370,8 +370,11 @@ static void virtio_gpu_queue_fenced_ctrl_buffer(struct virtio_gpu_device *vgdev,
                if (is_vmalloc_addr(vbuf->data_buf)) {
                        sgt = vmalloc_to_sgt(vbuf->data_buf, vbuf->data_size,
                                             &outcnt);
-                       if (!sgt)
+                       if (!sgt) {
+                               if (fence && vbuf->objs)
+                                       virtio_gpu_array_unlock_resv(vbuf->objs);
                                return;
+                       }
                        vout = sgt->sgl;
                } else {
                        sg_init_one(&sg, vbuf->data_buf, vbuf->data_size);