Json read check json size #1709
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
swlars
reviewed
Sep 6, 2024
src/iperf_api.c
Outdated
| hsize = ntohl(nsize); | ||
| rc = Nread(fd, (char*) &nsize, sizeof(nsize), Ptcp); | ||
| hsize = ntohl(nsize); | ||
| if (rc == sizeof(nsize) && hsize > 0 && hsize <= MAX_PARAMS_JSON_STRING) { |
There was a problem hiding this comment.
Hey David, thank you for the pull request. We like this change, but we would prefer it if the rc check was separate and before we use the value of nsize. If Nread fails, it would be better to just fall through.
if (rc == sizeof(nsize)){
hsize = ntohl(nsize);
if (hsize > 0 && hsize <= MAX_PARAMS_JSON_STRING) {
...
}
}
Also, I realize it's not there now, but adding a print statement else if it fails the size checks would be helpful. Let us know what you think!
There was a problem hiding this comment.
Changes done (hopefully as requested).
davidBar-On
force-pushed
the
JSON_read-check-JSON-size
branch
from
d0b1cf8
to
d2a6ba6
Compare
|
Perfect! Thanks again for the pull request! |
This was referenced Sep 27, 2024
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.
Version of iperf3 (or development branch, such as
masteror3.1-STABLE) to which this pull request applies:latest
Issues fixed (if any): None
Brief description of code changes (suitable for use as a commit message):
When receiving Params JSON size, verify that received exactly the
sizeof(<size variable>)bytes.In addition, added a check that the size received is reasonable - positive and is less than 8KB (which probably is much more that needed and may be reduced).