Skip to content

Commit 07a5dcc

Browse files
Yuuoniyandersson
authored andcommitted
remoteproc: qcom_q6v5_mss: Fix some leaks in q6v5_alloc_memory_region
The device_node pointer is returned by of_parse_phandle() or of_get_child_by_name() with refcount incremented. We should use of_node_put() on it when done. This function only call of_node_put(node) when of_address_to_resource succeeds, missing error cases. Fixes: 278d744 ("remoteproc: qcom: Fix potential device node leaks") Fixes: 051fb70 ("remoteproc: qcom: Driver for the self-authenticating Hexagon v5") Signed-off-by: Miaoqian Lin <linmq006@gmail.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20220308064522.13804-1-linmq006@gmail.com
1 parent 8f90161 commit 07a5dcc

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

drivers/remoteproc/qcom_q6v5_mss.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,18 +1806,20 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
18061806
* reserved memory regions from device's memory-region property.
18071807
*/
18081808
child = of_get_child_by_name(qproc->dev->of_node, "mba");
1809-
if (!child)
1809+
if (!child) {
18101810
node = of_parse_phandle(qproc->dev->of_node,
18111811
"memory-region", 0);
1812-
else
1812+
} else {
18131813
node = of_parse_phandle(child, "memory-region", 0);
1814+
of_node_put(child);
1815+
}
18141816

18151817
ret = of_address_to_resource(node, 0, &r);
1818+
of_node_put(node);
18161819
if (ret) {
18171820
dev_err(qproc->dev, "unable to resolve mba region\n");
18181821
return ret;
18191822
}
1820-
of_node_put(node);
18211823

18221824
qproc->mba_phys = r.start;
18231825
qproc->mba_size = resource_size(&r);
@@ -1828,14 +1830,15 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
18281830
} else {
18291831
child = of_get_child_by_name(qproc->dev->of_node, "mpss");
18301832
node = of_parse_phandle(child, "memory-region", 0);
1833+
of_node_put(child);
18311834
}
18321835

18331836
ret = of_address_to_resource(node, 0, &r);
1837+
of_node_put(node);
18341838
if (ret) {
18351839
dev_err(qproc->dev, "unable to resolve mpss region\n");
18361840
return ret;
18371841
}
1838-
of_node_put(node);
18391842

18401843
qproc->mpss_phys = qproc->mpss_reloc = r.start;
18411844
qproc->mpss_size = resource_size(&r);

0 commit comments

Comments
 (0)