diff options
| author | Evan Nimmo <evan.nimmo@alliedtelesis.co.nz> | 2020-11-10 03:28:25 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2020-11-12 00:10:16 +0100 |
| commit | a5bea04fcc0b3c0aec71ee1fd58fd4ff7ee36177 (patch) | |
| tree | e20c708b57cd091758afcc458ce2fcca0b69e581 /drivers/of/address.c | |
| parent | Linux 5.10-rc3 (diff) | |
| download | linux-a5bea04fcc0b3c0aec71ee1fd58fd4ff7ee36177.tar.xz linux-a5bea04fcc0b3c0aec71ee1fd58fd4ff7ee36177.zip | |
of/address: Fix of_node memory leak in of_dma_is_coherent
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>
Diffstat (limited to 'drivers/of/address.c')
| -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 eb9ab4f1e80b..1c3257a2d4e3 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -1034,11 +1034,13 @@ out: */ 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); |