Validate node and property names #33
Merged
Conversation
This file contains 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
danielverkamp
force-pushed
the
node-name-valid
branch
from
88a8124
to
fc905b2
Compare
| @@ -255,6 +330,9 @@ impl FdtWriter { | |||
| /// `name` - name of the node; must not contain any NUL bytes. | |||
| pub fn begin_node(&mut self, name: &str) -> Result<FdtWriterNode> { | |||
| let name_cstr = CString::new(name).map_err(|_| Error::InvalidString)?; | |||
| if !node_name_valid(name) { | |||
There was a problem hiding this comment.
Can we add a comment here that in case the user uses unit-address, then they must provide a valid one according to the specification (and then add a link to the spec)?
There was a problem hiding this comment.
Sure, added a comment to this effect.
| assert!(!node_name_valid("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")); | ||
| assert!(!node_name_valid("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@1234")); | ||
|
|
||
| // Name contains invalid characters. |
There was a problem hiding this comment.
Can we also add a test case with the invalid character /? Having that char in the name will split the node in 2 nodes, so I think we should check for it in unit tests as well.
There was a problem hiding this comment.
Good point - I added a test for a name containing "/".
Add checks for the requirements in the devicetree specifications. This does not check for any specific bus binding requirements for unit addresses (as in "node-name@unit-address"); only the generic requirements for all node names are enforced. Fixes rust-vmm#32. Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
danielverkamp
force-pushed
the
node-name-valid
branch
from
fc905b2
to
28f184f
Compare
andreeaflorescu
approved these changes
Aug 25, 2021
lauralt
approved these changes
Aug 25, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add checks for the requirements in the devicetree specifications.
This does not check for any specific bus binding requirements for unit
addresses (as in "node-name@unit-address"); only the generic
requirements for all node names are enforced.
Fixes #32.
Signed-off-by: Daniel Verkamp dverkamp@chromium.org