diff options
| author | Evan Nimmo <evan.nimmo@alliedtelesis.co.nz> | 2020-11-10 15:28:25 +1300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-18 18:26:27 +0100 |
| commit | 02317044a80418b4bf4513fa710e030c655a2a6f (patch) | |
| tree | b33128e744e6a1e3e924e2ae82cea1b3bf8f86a6 /drivers/of | |
| parent | 8acbfc86951b9141ccced70183cd42f86e3ed7de (diff) | |
of/address: Fix of_node memory leak in of_dma_is_coherent
[ Upstream commit a5bea04fcc0b3c0aec71ee1fd58fd4ff7ee36177 ]
Commit dabf6b36b83a ("of: Add OF_DMA_DEFAULT_COHERENT & select it on
powerpc") added a check to of_dma_is_coherent which returns early
if OF_DMA_DEFAULT_COHERENT is enabled. This results in the of_node_put()
being skipped causing a memory leak. Moved the of_node_get() below this
check so we now we only get the node if OF_DMA_DEFAULT_COHERENT is not
enabled.
Fixes: dabf6b36b83a ("of: Add OF_DMA_DEFAULT_COHERENT & select it on powerpc")
Signed-off-by: Evan Nimmo <evan.nimmo@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20201110022825.30895-1-evan.nimmo@alliedtelesis.co.nz
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/address.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 37619bb2c97a..d188eacbd3b8 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -901,11 +901,13 @@ EXPORT_SYMBOL_GPL(of_dma_get_range); */ bool of_dma_is_coherent(struct device_node *np) { - struct device_node *node = of_node_get(np); + struct device_node *node; if (IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT)) return true; + node = of_node_get(np); + while (node) { if (of_property_read_bool(node, "dma-coherent")) { of_node_put(node); |