From 0549bde0fcb11a95773e7dc4121738b9e653abf4 Mon Sep 17 00:00:00 2001 From: Qi Hou Date: Mon, 6 Feb 2017 12:55:19 +0800 Subject: [PATCH] of: fix of_node leak caused in of_find_node_opts_by_path During stepping down the tree, parent node is gotten first and its refcount is increased with of_node_get() in __of_get_next_child(). Since it just being used as tmp node, its refcount must be decreased with of_node_put() after traversing its child nodes. Or, its refcount will never be descreased to ZERO, then it will never be freed, as well as other related memory blocks. To fix this, decrease refcount of parent with of_node_put() after __of_find_node_by_path(). Signed-off-by: Qi Hou Acked-by: Peter Rosin Signed-off-by: Rob Herring --- drivers/of/base.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/of/base.c b/drivers/of/base.c index d4bea3c797d6..ce8206f9f97a 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -842,8 +842,11 @@ struct device_node *of_find_node_opts_by_path(const char *path, const char **opt if (!np) np = of_node_get(of_root); while (np && *path == '/') { + struct device_node *tmp = np; + path++; /* Increment past '/' delimiter */ np = __of_find_node_by_path(np, path); + of_node_put(tmp); path = strchrnul(path, '/'); if (separator && separator < path) break; -- 2.11.0