Skip to contentSkip to conversation

soc: qcom: smp2p: Add of_node_put() at goto

PATCH Superseded Nishka Dasgupta 2 participants 2 messages Aug 4, 2019 – Aug 5, 2019

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: qcom: smp2p: Add of_node_put() at goto

Each iteration of for_each_available_child_of_node puts the previous node, but in the case of a goto from the middle of the loop, there is no put, thus causing a memory leak. Hence make the gotos within the loop first go to a new label where an of_node_put() puts the last used node, before falling through to the original label.
Issue found with Coccinelle.

---
 drivers/soc/qcom/smp2p.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/soc/qcom/smp2p.c +6 -4
index c7300d54e444..d223e914487d 100644
@@ -501,7 +501,7 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 		entry = devm_kzalloc(&pdev->dev, sizeof(*entry), GFP_KERNEL);
 		if (!entry) {
 			ret = -ENOMEM;
-			goto unwind_interfaces;
+			goto release_child;
 		}
 
 		entry->smp2p = smp2p;
@@ -509,18 +509,18 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 
 		ret = of_property_read_string(node, "qcom,entry-name", &entry->name);
 		if (ret < 0)
-			goto unwind_interfaces;
+			goto release_child;
 
 		if (of_property_read_bool(node, "interrupt-controller")) {
 			ret = qcom_smp2p_inbound_entry(smp2p, entry, node);
 			if (ret < 0)
-				goto unwind_interfaces;
+				goto release_child;
 
 			list_add(&entry->node, &smp2p->inbound);
 		} else  {
 			ret = qcom_smp2p_outbound_entry(smp2p, entry, node);
 			if (ret < 0)
-				goto unwind_interfaces;
+				goto release_child;
 
 			list_add(&entry->node, &smp2p->outbound);
 		}
@@ -541,6 +541,8 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 
 	return 0;
 
+release_child:
+	of_node_put(node);
 unwind_interfaces:
 	list_for_each_entry(entry, &smp2p->inbound, node)
 		irq_domain_remove(entry->domain);
Signature · 1 line
2.19.1
#1 lore raw
Quoted 7 lines · Nishka Dasgupta

Each iteration of for_each_available_child_of_node puts the previous node, but in the case of a goto from the middle of the loop, there is no put, thus causing a memory leak. Hence make the gotos within the loop first go to a new label where an of_node_put() puts the last used node, before falling through to the original label.
Issue found with Coccinelle.

Good catch, thanks for the patch!

Quoted 41 lines
---
 drivers/soc/qcom/smp2p.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/soc/qcom/smp2p.c +4 -4
index c7300d54e444..d223e914487d 100644
@@ -501,7 +501,7 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 		entry = devm_kzalloc(&pdev->dev, sizeof(*entry), GFP_KERNEL);
 		if (!entry) {
 			ret = -ENOMEM;
-			goto unwind_interfaces;
+			goto release_child;
 		}
 
 		entry->smp2p = smp2p;
@@ -509,18 +509,18 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 
 		ret = of_property_read_string(node, "qcom,entry-name", &entry->name);
 		if (ret < 0)
-			goto unwind_interfaces;
+			goto release_child;
 
 		if (of_property_read_bool(node, "interrupt-controller")) {
 			ret = qcom_smp2p_inbound_entry(smp2p, entry, node);
 			if (ret < 0)
-				goto unwind_interfaces;
+				goto release_child;
 
 			list_add(&entry->node, &smp2p->inbound);
 		} else  {
 			ret = qcom_smp2p_outbound_entry(smp2p, entry, node);
 			if (ret < 0)
-				goto unwind_interfaces;
+				goto release_child;
 
 			list_add(&entry->node, &smp2p->outbound);
 		}

drivers/soc/qcom/smp2p.c static int qcom_smp2p_probe(struct platform_device *pdev) · line 545

Quoted 5 lines
drivers/soc/qcom/smp2p.c +2 -0
@@ -541,6 +541,8 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 
 	return 0;
 
+release_child:
+	of_node_put(node);

Following the loop over the children we request the irq and if that falls we'll jump to unwind_interfaces. So while it would work fine to jump to release_child within the loop and then unwind_interfaces after the loop, it doesn't follow the idiomatic way of using the error path to "unroll" things that has been setup up until a particular point in the function.

So I would rather see that you of_node_put() in the loop and then jump to unwind_interfaces as is done today.

Regards,
Bjorn

Quoted 6 lines
drivers/soc/qcom/smp2p.c +0 -0
 unwind_interfaces:
 	list_for_each_entry(entry, &smp2p->inbound, node)
 		irq_domain_remove(entry->domain);
Signature · 1 line
2.19.1