Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0a6cc9e authored by Evan Nimmo's avatar Evan Nimmo Committed by Greg Kroah-Hartman
Browse files

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: default avatarEvan Nimmo <evan.nimmo@alliedtelesis.co.nz>
Link: https://lore.kernel.org/r/20201110022825.30895-1-evan.nimmo@alliedtelesis.co.nz


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f10d238a

drivers/of/address.c

+3 −1
Original line number Diff line number Diff line
@@ -1003,11 +1003,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);