mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
remoteproc: qcom_q6v5_mss: Fix some leaks in q6v5_alloc_memory_region
[ Upstream commit07a5dcc4be
] 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:
parent
81655886d3
commit
b9df3007b3
1 changed files with 7 additions and 4 deletions
|
@ -1806,18 +1806,20 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
|
|||
* reserved memory regions from device's memory-region property.
|
||||
*/
|
||||
child = of_get_child_by_name(qproc->dev->of_node, "mba");
|
||||
if (!child)
|
||||
if (!child) {
|
||||
node = of_parse_phandle(qproc->dev->of_node,
|
||||
"memory-region", 0);
|
||||
else
|
||||
} else {
|
||||
node = of_parse_phandle(child, "memory-region", 0);
|
||||
of_node_put(child);
|
||||
}
|
||||
|
||||
ret = of_address_to_resource(node, 0, &r);
|
||||
of_node_put(node);
|
||||
if (ret) {
|
||||
dev_err(qproc->dev, "unable to resolve mba region\n");
|
||||
return ret;
|
||||
}
|
||||
of_node_put(node);
|
||||
|
||||
qproc->mba_phys = r.start;
|
||||
qproc->mba_size = resource_size(&r);
|
||||
|
@ -1828,14 +1830,15 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
|
|||
} else {
|
||||
child = of_get_child_by_name(qproc->dev->of_node, "mpss");
|
||||
node = of_parse_phandle(child, "memory-region", 0);
|
||||
of_node_put(child);
|
||||
}
|
||||
|
||||
ret = of_address_to_resource(node, 0, &r);
|
||||
of_node_put(node);
|
||||
if (ret) {
|
||||
dev_err(qproc->dev, "unable to resolve mpss region\n");
|
||||
return ret;
|
||||
}
|
||||
of_node_put(node);
|
||||
|
||||
qproc->mpss_phys = qproc->mpss_reloc = r.start;
|
||||
qproc->mpss_size = resource_size(&r);
|
||||
|
|
Loading…
Reference in a new issue