[PATCH 2/3] accel/ivpu: Fix memory leak in ivpu_mmu_reserved_context_init()

[Jacek Lawrynowicz]

Add appropriate error handling to ensure all allocated resources are
released upon encountering an error.

Fixes: a74f4d991352 ("accel/ivpu: Defer MMU root page table allocation")
Cc: Karol Wachowski <karol.wachow...@intel.com>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynow...@linux.intel.com>
Reviewed-by: Karol Wachowski <karol.wachow...@intel.com>
---
 drivers/accel/ivpu/ivpu_mmu_context.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/accel/ivpu/ivpu_mmu_context.c 
b/drivers/accel/ivpu/ivpu_mmu_context.c
index 891967a95bc3c..0af614dfb6f92 100644
--- a/drivers/accel/ivpu/ivpu_mmu_context.c
+++ b/drivers/accel/ivpu/ivpu_mmu_context.c
@@ -612,18 +612,22 @@ int ivpu_mmu_reserved_context_init(struct ivpu_device 
*vdev)
        if (!ivpu_mmu_ensure_pgd(vdev, &vdev->rctx.pgtable)) {
                ivpu_err(vdev, "Failed to allocate root page table for reserved 
context\n");
                ret = -ENOMEM;
-               goto unlock;
+               goto err_ctx_fini;
        }
 
        ret = ivpu_mmu_cd_set(vdev, vdev->rctx.id, &vdev->rctx.pgtable);
        if (ret) {
                ivpu_err(vdev, "Failed to set context descriptor for reserved 
context\n");
-               goto unlock;
+               goto err_ctx_fini;
        }
 
-unlock:
        mutex_unlock(&vdev->rctx.lock);
        return ret;
+
+err_ctx_fini:
+       mutex_unlock(&vdev->rctx.lock);
+       ivpu_mmu_context_fini(vdev, &vdev->rctx);
+       return ret;
 }
 
 void ivpu_mmu_reserved_context_fini(struct ivpu_device *vdev)
-- 
2.45.1