[PATCH] firmware: qcom: tzmem: Clean up SHM bridge on pool add failure

From: Haoxiang Li

Date: Wed Nov 18 2026 - 08:24:20 EST


If gen_pool_add_virt() fails after qcom_tzmem_init_area() succeeds,
qcom_tzmem_pool_add_memory() frees the DMA memory and area descriptor
but leaves the SHM bridge and its handle allocated.

Since the area has not been added to pool->areas, pool destruction
cannot reclaim these resources. Call qcom_tzmem_cleanup_area() before
freeing the DMA memory to delete the bridge and release its handle.

Fixes: f86c61498a57 ("firmware: qcom: tzmem: enable SHM Bridge support")
Signed-off-by: Haoxiang Li <haoxiang_li2024@xxxxxxx>
---
drivers/firmware/qcom/qcom_tzmem.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/firmware/qcom/qcom_tzmem.c b/drivers/firmware/qcom/qcom_tzmem.c
index e1d944d0eb63..b2ca1d18bf3b 100644
--- a/drivers/firmware/qcom/qcom_tzmem.c
+++ b/drivers/firmware/qcom/qcom_tzmem.c
@@ -219,6 +219,7 @@ static int qcom_tzmem_pool_add_memory(struct qcom_tzmem_pool *pool,
ret = gen_pool_add_virt(pool->genpool, (unsigned long)area->vaddr,
(phys_addr_t)area->paddr, size, -1);
if (ret) {
+ qcom_tzmem_cleanup_area(area);
dma_free_coherent(qcom_tzmem_dev, area->size,
area->vaddr, area->paddr);
return ret;
--
2.25.1