xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remoteproc: qcom_q6v5_mss: Fix some leaks in q6v5_alloc_memory_region

Browse Source 
[ Upstream commit 07a5dcc4bed9d7cae54adf5aa10ff9f037a3204b ]

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: 278d744c46 ("remoteproc: qcom: Fix potential device node leaks")
Fixes: 051fb70fd4 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Miaoqian Lin
2022-03-08 06:45:21 +00:00
committed by Greg Kroah-Hartman
parent 7a494580a8
commit f7210ca29a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/remoteproc/qcom_q6v5_mss.c
View File

@@ -1594,18 +1594,20 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
* reserved memory regions from device's memory-region property. * reserved memory regions from device's memory-region property.
*/ */
child = of_get_child_by_name(qproc->dev->of_node, "mba"); child = of_get_child_by_name(qproc->dev->of_node, "mba");
if (!child) if (!child) {
node = of_parse_phandle(qproc->dev->of_node, node = of_parse_phandle(qproc->dev->of_node,
"memory-region", 0); "memory-region", 0);
else } else {
node = of_parse_phandle(child, "memory-region", 0); node = of_parse_phandle(child, "memory-region", 0);
of_node_put(child);
}
ret = of_address_to_resource(node, 0, &r); ret = of_address_to_resource(node, 0, &r);
of_node_put(node);
if (ret) { if (ret) {
dev_err(qproc->dev, "unable to resolve mba region\n"); dev_err(qproc->dev, "unable to resolve mba region\n");
return ret; return ret;
} }
of_node_put(node);
qproc->mba_phys = r.start; qproc->mba_phys = r.start;
qproc->mba_size = resource_size(&r); qproc->mba_size = resource_size(&r);
@@ -1622,14 +1624,15 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
} else { } else {
child = of_get_child_by_name(qproc->dev->of_node, "mpss"); child = of_get_child_by_name(qproc->dev->of_node, "mpss");
node = of_parse_phandle(child, "memory-region", 0); node = of_parse_phandle(child, "memory-region", 0);
of_node_put(child);
} }
ret = of_address_to_resource(node, 0, &r); ret = of_address_to_resource(node, 0, &r);
of_node_put(node);
if (ret) { if (ret) {
dev_err(qproc->dev, "unable to resolve mpss region\n"); dev_err(qproc->dev, "unable to resolve mpss region\n");
return ret; return ret;
} }
of_node_put(node);
qproc->mpss_phys = qproc->mpss_reloc = r.start; qproc->mpss_phys = qproc->mpss_reloc = r.start;
qproc->mpss_size = resource_size(&r); qproc->mpss_size = resource_size(&r);