projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a9eb11
)
drivers core: Free dma_range_map when driver probe failed
author
Meng Li
<Meng.Li@windriver.com>
Tue, 5 Jan 2021 07:09:27 +0000
(15:09 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 27 Jan 2021 10:55:18 +0000
(11:55 +0100)
commit
d0243bbd5dd3ebbd49dafa8b56bb911d971131d0
upstream.
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.
Fixes:
e0d072782c73
("dma-mapping: introduce DMA range map, supplanting dma_pfn_offset ")
Cc: stable@vger.kernel.org
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Link:
https://lore.kernel.org/r/20210105070927.14968-1-Meng.Li@windriver.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/dd.c
patch
|
blob
|
history
diff --git
a/drivers/base/dd.c
b/drivers/base/dd.c
index
148e819
..
3c94ebc
100644
(file)
--- a/
drivers/base/dd.c
+++ b/
drivers/base/dd.c
@@
-612,6
+612,8
@@
dev_groups_failed:
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);