Skip to contentSkip to conversation

drivers core: Free dma_range_map when driver probe failed

PATCH Superseded [email protected] 2 participants 3 messages Jan 5, 2021 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drivers core: Free dma_range_map when driver probe failed

From: Limeng <[email protected]>

There will be memory leak if driver probe failed. Trace as below:
backtrace:

    [<000000002415258f>] kmemleak_alloc+0x3c/0x50
    [<00000000f447ebe4>] __kmalloc+0x208/0x530
    [<0000000048bc7b3a>] of_dma_get_range+0xe4/0x1b0
    [<0000000041e39065>] of_dma_configure_id+0x58/0x27c
    [<000000006356866a>] platform_dma_configure+0x2c/0x40
    ......
    [<000000000afcf9b5>] ret_from_fork+0x10/0x3c

This issue is introduced by commit e0d072782c73("dma-mapping:
introduce DMA range map, supplanting dma_pfn_offset "). It doesn't free dma_range_map when driver probe failed and cause above memory leak. So, add code to free it in error path.

v2:
set dev->dma_range_map as NULL after memory free.

Fixes e0d072782c73("dma-mapping: introduce DMA range map, supplanting dma_pfn_offset ")
---
 drivers/base/dd.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/base/dd.c +2 -0
index 148e81969e04..3c94ebc8d4bb 100644
@@ -612,6 +612,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)
 	else if (drv->remove)
 		drv->remove(dev);
 probe_failed:
+	kfree(dev->dma_range_map);
+	dev->dma_range_map = NULL;
 	if (dev->bus)
 		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
 					     BUS_NOTIFY_DRIVER_NOT_BOUND, dev);
Signature · 1 line
2.17.1
author
#2 lore raw
Quoted 11 lines

-----Original Message-----
From: Greg KH <[email protected]>
Sent: Tuesday, January 5, 2021 2:01 PM
To: Li, Meng <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Hao, Kexin <[email protected]>
Subject: Re: [PATCH v2] drivers core: Free dma_range_map when driver probe failed

Quoted 4 lines
Quoted 1 line · On Tue, Jan 05, 2021 at 01:41:48PM +0800, [email protected] wrote:

From: Limeng <[email protected]>

This does not match your signed-off-by line :(

I will fix it.

Thanks,
Limeng