]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
media: iris: Add buffer to list only after successful allocation
authorDikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Mon, 29 Dec 2025 06:31:20 +0000 (12:01 +0530)
committerHans Verkuil <hverkuil+cisco@kernel.org>
Tue, 20 Jan 2026 13:00:12 +0000 (14:00 +0100)
Move `list_add_tail()` to after `dma_alloc_attrs()` succeeds when creating
internal buffers. Previously, the buffer was enqueued in `buffers->list`
before the DMA allocation. If the allocation failed, the function returned
`-ENOMEM` while leaving a partially initialized buffer in the list, which
could lead to inconsistent state and potential leaks.

By adding the buffer to the list only after `dma_alloc_attrs()` succeeds,
we ensure the list contains only valid, fully initialized buffers.

Fixes: 73702f45db81 ("media: iris: allocate, initialize and queue internal buffers")
Reviewed-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Reviewed-by: Vikash Garodia <vikash.garodia@oss.qualcomm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
drivers/media/platform/qcom/iris/iris_buffer.c

index b89b1ee06cce151e7c04a80956380d154643c116..f1f003a787bf22db6f048c9e682ba8ed2f39bc21 100644 (file)
@@ -351,12 +351,15 @@ static int iris_create_internal_buffer(struct iris_inst *inst,
        buffer->index = index;
        buffer->buffer_size = buffers->size;
        buffer->dma_attrs = DMA_ATTR_WRITE_COMBINE | DMA_ATTR_NO_KERNEL_MAPPING;
-       list_add_tail(&buffer->list, &buffers->list);
 
        buffer->kvaddr = dma_alloc_attrs(core->dev, buffer->buffer_size,
                                         &buffer->device_addr, GFP_KERNEL, buffer->dma_attrs);
-       if (!buffer->kvaddr)
+       if (!buffer->kvaddr) {
+               kfree(buffer);
                return -ENOMEM;
+       }
+
+       list_add_tail(&buffer->list, &buffers->list);
 
        return 0;
 }