[PATCH v2 2/2] drm/virtio: Fix missed dmabuf unpinning in error path of prepare_fb()

[Dmitry Osipenko]

Correct error handling in prepare_fb() to fix leaking resources when
error happens.

Fixes: 4a696a2ee646 ("drm/virtio: Add prepare and cleanup routines for imported 
dmabuf obj")
Cc: <sta...@vger.kernel.org> # v6.14+
Acked-by: Vivek Kasireddy <vivek.kasire...@intel.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipe...@collabora.com>
---

v2: Change order of prep_obj/fence_alloc, add ack from Vivek

 drivers/gpu/drm/virtio/virtgpu_plane.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c 
b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 42aa554eca9f..26abe3d1b122 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -322,12 +322,6 @@ static int virtio_gpu_plane_prepare_fb(struct drm_plane 
*plane,
                return 0;
 
        obj = new_state->fb->obj[0];
-       if (obj->import_attach) {
-               ret = virtio_gpu_prepare_imported_obj(plane, new_state, obj);
-               if (ret)
-                       return ret;
-       }
-
        if (bo->dumb || obj->import_attach) {
                vgplane_st->fence = virtio_gpu_fence_alloc(vgdev,
                                                     vgdev->fence_drv.context,
@@ -336,7 +330,21 @@ static int virtio_gpu_plane_prepare_fb(struct drm_plane 
*plane,
                        return -ENOMEM;
        }
 
+       if (obj->import_attach) {
+               ret = virtio_gpu_prepare_imported_obj(plane, new_state, obj);
+               if (ret)
+                       goto err_fence;
+       }
+
        return 0;
+
+err_fence:
+       if (vgplane_st->fence) {
+               dma_fence_put(&vgplane_st->fence->f);
+               vgplane_st->fence = NULL;
+       }
+
+       return ret;
 }
 
 static void virtio_gpu_cleanup_imported_obj(struct drm_gem_object *obj)
-- 
2.49.0