diff options
| author | Chris Goldsworthy <cgoldswo@codeaurora.org> | 2019-10-20 03:57:24 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2019-10-23 22:15:05 +0200 |
| commit | 5dba51754b04a941a1064f584e7a7f607df3f9bc (patch) | |
| tree | 973fade922a5eac94982b602d8a8c540aa78965b /drivers/of | |
| parent | of: unittest: fix memory leak in unittest_data_add (diff) | |
| download | linux-5dba51754b04a941a1064f584e7a7f607df3f9bc.tar.xz linux-5dba51754b04a941a1064f584e7a7f607df3f9bc.zip | |
of: reserved_mem: add missing of_node_put() for proper ref-counting
Commit d698a388146c ("of: reserved-memory: ignore disabled memory-region
nodes") added an early return in of_reserved_mem_device_init_by_idx(), but
didn't call of_node_put() on a device_node whose ref-count was incremented
in the call to of_parse_phandle() preceding the early exit.
Fixes: d698a388146c ("of: reserved-memory: ignore disabled memory-region nodes")
Signed-off-by: Chris Goldsworthy <cgoldswo@codeaurora.org>
Cc: stable@vger.kernel.org
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_reserved_mem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 7989703b883c..6bd610ee2cd7 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, if (!target) return -ENODEV; - if (!of_device_is_available(target)) + if (!of_device_is_available(target)) { + of_node_put(target); return 0; + } rmem = __find_rmem(target); of_node_put(target); |