dtc: Fix NULL pointer use in dtlabel + dtref case
PATCH v2 1/1 dtc: Fix NULL pointer use in dtlabel + dtref case
If we have a construct like this:
label: &handle {
...
};Running dtc on it will cause a segfault, because we use 'target' when it could be NULL. Move the add_label() call into the if statement to fix this potentially bad use of a NULL pointer.
---
Changes from v1:
* Add a test to ensure we flag an error
dtc-parser.y | 6 +++--- tests/run_tests.sh | 1 + tests/test_label_ref.dts | 9 +++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 tests/test_label_ref.dts
dtc-parser.y +3 -3
@@ -171,10 +171,10 @@ devicetree: { struct node *target = get_node_by_ref($1, $3); - add_label(&target->labels, $2); - if (target) + if (target) { + add_label(&target->labels, $2); merge_nodes(target, $4); - else + } else ERROR(&@3, "Label or path %s not found", $3); $$ = $1; }
tests/run_tests.sh +1 -0
@@ -511,6 +511,7 @@ dtc_tests () { run_test dtbs_equal_ordered multilabel.test.dtb multilabel_merge.test.dtb run_dtc_test -I dts -O dtb -o dtc_tree1_merge_path.test.dtb test_tree1_merge_path.dts tree1_tests dtc_tree1_merge_path.test.dtb test_tree1.dtb + run_wrap_error_test $DTC -I dts -O dtb -o /dev/null test_label_ref.dts # Check prop/node delete functionality run_dtc_test -I dts -O dtb -o dtc_tree1_delete.test.dtb test_tree1_delete.dts
tests/test_label_ref.dts new file +9 -0
@@ -0,0 +1,9 @@ +/dts-v1/; + +/ { + +}; + +label: &handle { + +};
Signature · 1 line
2.10.0.297.gf6727b0
A message that is not in the archive (sent off-list or not yet received): 20170130220617.19128-1-stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
David Gibson
AppliedQuoted 11 lines · Stephen Boyd
If we have a construct like this:
label: &handle { ... };Running dtc on it will cause a segfault, because we use 'target' when it could be NULL. Move the
add_label()call into the if statement to fix this potentially bad use of a NULL pointer.Signed-off-by Stephen Boyd <[email protected]>
Applied, thanks.
Quoted 56 lines
---
Changes from v1:
* Add a test to ensure we flag an errordtc-parser.y | 6 +++--- tests/run_tests.sh | 1 + tests/test_label_ref.dts | 9 +++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 tests/test_label_ref.dtsdtc-parser.y +3
-3@@ -171,10 +171,10 @@ devicetree: { struct node *target = get_node_by_ref($1, $3); - add_label(&target->labels, $2); - if (target) + if (target) { + add_label(&target->labels, $2); merge_nodes(target, $4); - else + } else ERROR(&@3, "Label or path %s not found", $3); $$ = $1; }tests/run_tests.sh +1
-0@@ -511,6 +511,7 @@ dtc_tests () { run_test dtbs_equal_ordered multilabel.test.dtb multilabel_merge.test.dtb run_dtc_test -I dts -O dtb -o dtc_tree1_merge_path.test.dtb test_tree1_merge_path.dts tree1_tests dtc_tree1_merge_path.test.dtb test_tree1.dtb + run_wrap_error_test $DTC -I dts -O dtb -o /dev/null test_label_ref.dts # Check prop/node delete functionality run_dtc_test -I dts -O dtb -o dtc_tree1_delete.test.dtb test_tree1_delete.dtstests/test_label_ref.dts new file +9
-0@@ -0,0 +1,9 @@ +/dts-v1/; + +/ { + +}; + +label: &handle { + +};
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson