diff options
| author | Christian A. Ehrhardt <lk@c--e.de> | 2023-12-29 11:54:11 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2024-01-09 12:54:02 -0600 |
| commit | 4dde83569832f9377362e50f7748463340c5db6b (patch) | |
| tree | 1d370180e33cb5df5bf0eebdbbe44a7dcd4f5c49 /drivers/of/base.c | |
| parent | 5e3ef45468196498ad1a7132f274d6709e3a1146 (diff) | |
of: Fix double free in of_parse_phandle_with_args_map
In of_parse_phandle_with_args_map() the inner loop that
iterates through the map entries calls of_node_put(new)
to free the reference acquired by the previous iteration
of the inner loop. This assumes that the value of "new" is
NULL on the first iteration of the inner loop.
Make sure that this is true in all iterations of the outer
loop by setting "new" to NULL after its value is assigned to "cur".
Extend the unittest to detect the double free and add an additional
test case that actually triggers this path.
Fixes: bd6f2fd5a1 ("of: Support parsing phandle argument lists through a nexus node")
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: "Christian A. Ehrhardt" <lk@c--e.de>
Link: https://lore.kernel.org/r/20231229105411.1603434-1-lk@c--e.de
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/base.c')
| -rw-r--r-- | drivers/of/base.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 8d93cb6ea9cd..b0ad8fc06e80 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1464,6 +1464,7 @@ int of_parse_phandle_with_args_map(const struct device_node *np, out_args->np = new; of_node_put(cur); cur = new; + new = NULL; } put: of_node_put(cur); |