[PATCH v2 5.10.y] firmware: stratix10-svc: fix memory leaks and list corruption bugs
[email protected] Tue, 4 Aug 2026 01:59:01 -0700
| Newsgroups | org.kernel.vger.stable |
|---|---|
| Message-ID | <7ddb7d1021fe8261a7a3d163ee78d345c6ea78fa.1785833566.git.tze.yee.ng@altera.com> |
From: Tze Yee Ng <[email protected]> Fix a memory leak when gen_pool_alloc() fails by freeing pmem on the error path. Switch pmem allocation from devm_kzalloc() to kzalloc() with explicit kfree() in the free path to match its list-managed lifetime. Remove the erroneous list_del(&svc_data_mem) which corrupted the list head on failed lookups. Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver") Cc: [email protected]#5.0+ Signed-off-by: Tze Yee Ng <[email protected]> Signed-off-by: Dinh Nguyen <[email protected]> (cherry picked from commit 9119ceb76e987c2ec2b549ea100e3268ce3a1c7c) --- Changes in v2: - Replaced kzalloc_obj() with kzalloc(sizeof(*pmem), GFP_KERNEL). - Dropped the stray guard(mutex)(&svc_mem_lock) which is added accidentally when rebase. --- drivers/firmware/stratix10-svc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c index 6b6a819fcddf..ae6d942ab2d7 100644 --- a/drivers/firmware/stratix10-svc.c +++ b/drivers/firmware/stratix10-svc.c @@ -911,13 +911,15 @@ void *stratix10_svc_allocate_memory(struct stratix10_svc_chan *chan, struct gen_pool *genpool = chan->ctrl->genpool; size_t s = roundup(size, 1 << genpool->min_alloc_order); - pmem = devm_kzalloc(chan->ctrl->dev, sizeof(*pmem), GFP_KERNEL); + pmem = kzalloc(sizeof(*pmem), GFP_KERNEL); if (!pmem) return ERR_PTR(-ENOMEM); va = gen_pool_alloc(genpool, s); - if (!va) + if (!va) { + kfree(pmem); return ERR_PTR(-ENOMEM); + } memset((void *)va, 0, s); pa = gen_pool_virt_to_phys(genpool, va); @@ -950,10 +952,9 @@ void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr) (unsigned long)kaddr, pmem->size); pmem->vaddr = NULL; list_del(&pmem->node); + kfree(pmem); return; } - - list_del(&svc_data_mem); } EXPORT_SYMBOL_GPL(stratix10_svc_free_memory); -- 2.43.7