Skip to content

Commit f39488e

Browse files
Georgi Djakovgregkh
authored andcommitted
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: 5e4e6c4 ("interconnect: qcom: Add QCS404 interconnect provider driver") Reported-by: Dmitry Osipenko <[email protected]> Reviewed-by: Bjorn Andersson <[email protected]> Signed-off-by: Georgi Djakov <[email protected]> Cc: <[email protected]> # v5.4 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b29b811 commit f39488e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/interconnect/qcom/qcs404.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ static int qnoc_probe(struct platform_device *pdev)
414414
struct icc_provider *provider;
415415
struct qcom_icc_node **qnodes;
416416
struct qcom_icc_provider *qp;
417-
struct icc_node *node;
417+
struct icc_node *node, *tmp;
418418
size_t num_nodes, i;
419419
int ret;
420420

@@ -494,7 +494,7 @@ static int qnoc_probe(struct platform_device *pdev)
494494

495495
return 0;
496496
err:
497-
list_for_each_entry(node, &provider->nodes, node_list) {
497+
list_for_each_entry_safe(node, tmp, &provider->nodes, node_list) {
498498
icc_node_del(node);
499499
icc_node_destroy(node->id);
500500
}
@@ -508,9 +508,9 @@ static int qnoc_remove(struct platform_device *pdev)
508508
{
509509
struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
510510
struct icc_provider *provider = &qp->provider;
511-
struct icc_node *n;
511+
struct icc_node *n, *tmp;
512512

513-
list_for_each_entry(n, &provider->nodes, node_list) {
513+
list_for_each_entry_safe(n, tmp, &provider->nodes, node_list) {
514514
icc_node_del(n);
515515
icc_node_destroy(n->id);
516516
}

0 commit comments

Comments
 (0)