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/unittest-data | |
| parent | 5e3ef45468196498ad1a7132f274d6709e3a1146 (diff) | |
| download | linux-stable-4dde83569832f9377362e50f7748463340c5db6b.tar.gz linux-stable-4dde83569832f9377362e50f7748463340c5db6b.tar.bz2 linux-stable-4dde83569832f9377362e50f7748463340c5db6b.zip | |
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/unittest-data')
| -rw-r--r-- | drivers/of/unittest-data/tests-phandle.dtsi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/of/unittest-data/tests-phandle.dtsi b/drivers/of/unittest-data/tests-phandle.dtsi index d01f92f0f0db..554a996b2ef1 100644 --- a/drivers/of/unittest-data/tests-phandle.dtsi +++ b/drivers/of/unittest-data/tests-phandle.dtsi @@ -40,6 +40,13 @@ phandle-map-pass-thru = <0x0 0xf0>; }; + provider5: provider5 { + #phandle-cells = <2>; + phandle-map = <2 7 &provider4 2 3>; + phandle-map-mask = <0xff 0xf>; + phandle-map-pass-thru = <0x0 0xf0>; + }; + consumer-a { phandle-list = <&provider1 1>, <&provider2 2 0>, @@ -66,7 +73,8 @@ <&provider4 4 0x100>, <&provider4 0 0x61>, <&provider0>, - <&provider4 19 0x20>; + <&provider4 19 0x20>, + <&provider5 2 7>; phandle-list-bad-phandle = <12345678 0 0>; phandle-list-bad-args = <&provider2 1 0>, <&provider4 0>; |