ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpmsg: smd: Fix a kobj leak in in qcom_smd_parse_edge()

Browse Source 
We need to call of_node_put(node) on the error paths for this function.

Fixes: 53e2822e56 ("rpmsg: Introduce Qualcomm SMD backend")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20200908071841.GA294938@mwanda
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Dan Carpenter
2020-09-08 10:18:41 +03:00
committed by Bjorn Andersson
parent 9123e3a74e
commit e69ee0cf65
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/rpmsg/qcom_smd.c
View File

@@ -1338,7 +1338,7 @@ static int qcom_smd_parse_edge(struct device *dev,
ret = of_property_read_u32(node, key, &edge->edge_id); ret = of_property_read_u32(node, key, &edge->edge_id);
if (ret) { if (ret) {
dev_err(dev, "edge missing %s property\n", key); dev_err(dev, "edge missing %s property\n", key);
return -EINVAL; goto put_node;
} }
edge->remote_pid = QCOM_SMEM_HOST_ANY; edge->remote_pid = QCOM_SMEM_HOST_ANY;
@@ -1349,32 +1349,37 @@ static int qcom_smd_parse_edge(struct device *dev,
edge->mbox_client.knows_txdone = true; edge->mbox_client.knows_txdone = true;
edge->mbox_chan = mbox_request_channel(&edge->mbox_client, 0); edge->mbox_chan = mbox_request_channel(&edge->mbox_client, 0);
if (IS_ERR(edge->mbox_chan)) { if (IS_ERR(edge->mbox_chan)) {
if (PTR_ERR(edge->mbox_chan) != -ENODEV) if (PTR_ERR(edge->mbox_chan) != -ENODEV) {
return PTR_ERR(edge->mbox_chan); ret = PTR_ERR(edge->mbox_chan);
goto put_node;
}
edge->mbox_chan = NULL; edge->mbox_chan = NULL;
syscon_np = of_parse_phandle(node, "qcom,ipc", 0); syscon_np = of_parse_phandle(node, "qcom,ipc", 0);
if (!syscon_np) { if (!syscon_np) {
dev_err(dev, "no qcom,ipc node\n"); dev_err(dev, "no qcom,ipc node\n");
return -ENODEV; ret = -ENODEV;
goto put_node;
} }
edge->ipc_regmap = syscon_node_to_regmap(syscon_np); edge->ipc_regmap = syscon_node_to_regmap(syscon_np);
if (IS_ERR(edge->ipc_regmap)) if (IS_ERR(edge->ipc_regmap)) {
return PTR_ERR(edge->ipc_regmap); ret = PTR_ERR(edge->ipc_regmap);
goto put_node;
}
key = "qcom,ipc"; key = "qcom,ipc";
ret = of_property_read_u32_index(node, key, 1, &edge->ipc_offset); ret = of_property_read_u32_index(node, key, 1, &edge->ipc_offset);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "no offset in %s\n", key); dev_err(dev, "no offset in %s\n", key);
return -EINVAL; goto put_node;
} }
ret = of_property_read_u32_index(node, key, 2, &edge->ipc_bit); ret = of_property_read_u32_index(node, key, 2, &edge->ipc_bit);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "no bit in %s\n", key); dev_err(dev, "no bit in %s\n", key);
return -EINVAL; goto put_node;
} }
} }
@@ -1385,7 +1390,8 @@ static int qcom_smd_parse_edge(struct device *dev,
irq = irq_of_parse_and_map(node, 0); irq = irq_of_parse_and_map(node, 0);
if (irq < 0) { if (irq < 0) {
dev_err(dev, "required smd interrupt missing\n"); dev_err(dev, "required smd interrupt missing\n");
return -EINVAL; ret = irq;
goto put_node;
} }
ret = devm_request_irq(dev, irq, ret = devm_request_irq(dev, irq,
@@ -1393,12 +1399,18 @@ static int qcom_smd_parse_edge(struct device *dev,
node->name, edge); node->name, edge);
if (ret) { if (ret) {
dev_err(dev, "failed to request smd irq\n"); dev_err(dev, "failed to request smd irq\n");
return ret; goto put_node;
} }
edge->irq = irq; edge->irq = irq;
return 0; return 0;
put_node:
of_node_put(node);
edge->of_node = NULL;
return ret;
} }
/* /*