Commit f39488ea authored by Georgi Djakov's avatar Georgi Djakov Committed by Greg Kroah-Hartman

interconnect: qcom: qcs404: Walk the list safely on node removal

As we will remove items off the list using list_del(), we need to use the
safe version of list_for_each_entry().

Fixes: 5e4e6c4d ("interconnect: qcom: Add QCS404 interconnect provider driver")
Reported-by: default avatarDmitry Osipenko <digetx@gmail.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>
Cc: <stable@vger.kernel.org> # v5.4
Link: https://lore.kernel.org/r/20191212075332.16202-4-georgi.djakov@linaro.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b29b8113
...@@ -414,7 +414,7 @@ static int qnoc_probe(struct platform_device *pdev) ...@@ -414,7 +414,7 @@ static int qnoc_probe(struct platform_device *pdev)
struct icc_provider *provider; struct icc_provider *provider;
struct qcom_icc_node **qnodes; struct qcom_icc_node **qnodes;
struct qcom_icc_provider *qp; struct qcom_icc_provider *qp;
struct icc_node *node; struct icc_node *node, *tmp;
size_t num_nodes, i; size_t num_nodes, i;
int ret; int ret;
...@@ -494,7 +494,7 @@ static int qnoc_probe(struct platform_device *pdev) ...@@ -494,7 +494,7 @@ static int qnoc_probe(struct platform_device *pdev)
return 0; return 0;
err: err:
list_for_each_entry(node, &provider->nodes, node_list) { list_for_each_entry_safe(node, tmp, &provider->nodes, node_list) {
icc_node_del(node); icc_node_del(node);
icc_node_destroy(node->id); icc_node_destroy(node->id);
} }
...@@ -508,9 +508,9 @@ static int qnoc_remove(struct platform_device *pdev) ...@@ -508,9 +508,9 @@ static int qnoc_remove(struct platform_device *pdev)
{ {
struct qcom_icc_provider *qp = platform_get_drvdata(pdev); struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
struct icc_provider *provider = &qp->provider; struct icc_provider *provider = &qp->provider;
struct icc_node *n; struct icc_node *n, *tmp;
list_for_each_entry(n, &provider->nodes, node_list) { list_for_each_entry_safe(n, tmp, &provider->nodes, node_list) {
icc_node_del(n); icc_node_del(n);
icc_node_destroy(n->id); icc_node_destroy(n->id);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment