drm/v3d: cleanup BOs properly when lookup_bos fails
authorMelissa Wen <mwen@igalia.com>
Mon, 5 Dec 2022 13:55:37 +0000 (12:55 -0100)
committerMelissa Wen <melissa.srw@gmail.com>
Mon, 19 Dec 2022 00:08:19 +0000 (23:08 -0100)
When v3d_lookup_bos fails to `allocate validated BO pointers`,
job->bo_count was already set to args->bo_count, but job->bo points to
NULL. In this scenario, we must verify that job->bo is not NULL before
iterating on it to proper clean up a job. Also, drm_gem_object_put
already checks that the object passed is not NULL, doing the job->bo[i]
checker redundant.

Signed-off-by: Melissa Wen <mwen@igalia.com>
Reviewed-by: MaĆ­ra Canal <mcanal@igalia.com>
Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221205135538.3545051-2-mwen@igalia.com
drivers/gpu/drm/v3d/v3d_gem.c

index 96af1cb..31a3757 100644 (file)
@@ -363,11 +363,11 @@ v3d_job_free(struct kref *ref)
        struct v3d_job *job = container_of(ref, struct v3d_job, refcount);
        int i;
 
-       for (i = 0; i < job->bo_count; i++) {
-               if (job->bo[i])
+       if (job->bo) {
+               for (i = 0; i < job->bo_count; i++)
                        drm_gem_object_put(job->bo[i]);
+               kvfree(job->bo);
        }
-       kvfree(job->bo);
 
        dma_fence_put(job->irq_fence);
        dma_fence_put(job->done_fence);