Skip to contentSkip to conversation

bus: mvebu-mbus: Add missing of_node_put in fail path

PATCH Superseded heliang 1 participant 1 message Jun 15, 2022 Arm/Marvell Dove/MV78xx0/Orion SoC support

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

heliang

author
#0 lore raw

PATCH 1/1 bus: mvebu-mbus: Add missing of_node_put in fail path

In mvebu_mbus_dt_init, of_find_matching_node_and_match() and of_find_node_by_phandle() will return node pointer with refcounter incremented. We should use of_node_put in fail path.

---
 drivers/bus/mvebu-mbus.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/bus/mvebu-mbus.c +6 -0
index db612045616f..7b16ede5097f 100644
@@ -1327,22 +1327,28 @@ int __init mvebu_mbus_dt_init(bool is_coherent)
 
 	prop = of_get_property(np, "controller", NULL);
 	if (!prop) {
+		of_node_put(np);
 		pr_err("required 'controller' property missing\n");
 		return -EINVAL;
 	}
 
 	controller = of_find_node_by_phandle(be32_to_cpup(prop));
 	if (!controller) {
+		of_node_put(np);
 		pr_err("could not find an 'mbus-controller' node\n");
 		return -ENODEV;
 	}
 
 	if (of_address_to_resource(controller, 0, &mbuswins_res)) {
+		of_node_put(np);
+		of_node_put(controller);
 		pr_err("cannot get MBUS register address\n");
 		return -EINVAL;
 	}
 
 	if (of_address_to_resource(controller, 1, &sdramwins_res)) {
+		of_node_put(np);
+		of_node_put(controller);
 		pr_err("cannot get SDRAM register address\n");
 		return -EINVAL;
 	}
Signature · 1 line
2.25.1