Correct function devicetree_get_compatible()#71
Open
xypron wants to merge 3 commits into
Open
Conversation
devicetree_get_compatible() used struct_off + struct_size as the loop bound while indexing a uint32_t array. That value is a byte offset, not a word count, so the parser could walk past the end of the structure block. Use size_words as the loop bound so the parser only inspects the actual structure block. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
devicetree_get_compatible() walked the structure block without tracking nesting depth, so a child node's compatible property could be returned when it appeared before the root /compatible property. Track begin/end node depth while parsing the structure block and only accept compatible at level 0 so the function matches the root node property. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Load one DTB with a root compatible property and one with only a child compatible property, then verify that devicetree_get_compatible() returns the root string for the first fixture and NULL for the second. Wire the test into make check and extend make clean to remove generated DTBs under test/data. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix the above and add a test.