packetbeat/route: improve netsh output handling #39757
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
efd6
added
backport-skip
botelastic
bot
added
needs_team
This improves the error handling for the testing invocation of netsh to allow the cause of elastic#39698 to be identified.
|
Pinging @elastic/sec-linux-platform (Team:Security-Linux Platform) |
nfritts
approved these changes
May 29, 2024
efd6
added a commit
that referenced
this pull request
Jun 7, 2024
Windows 2022 appears to have added new text to the output of netsh. The text is interpreted as having three fields. This impact on the behaviour of the field splitting which expects five. - Originally this would cause a panic due to bounds checking. This was fixed in #39757 by erroring on an unexpectedly short line. - The fieldsN helper expects lines to be n fields or longer, but does not terminate on lines with fewer fields. So treat the first blank line found in the table as the end of the table and fix the fieldsN helper.
mergify bot
pushed a commit
that referenced
this pull request
Jun 7, 2024
Windows 2022 appears to have added new text to the output of netsh. The text is interpreted as having three fields. This impact on the behaviour of the field splitting which expects five. - Originally this would cause a panic due to bounds checking. This was fixed in #39757 by erroring on an unexpectedly short line. - The fieldsN helper expects lines to be n fields or longer, but does not terminate on lines with fewer fields. So treat the first blank line found in the table as the end of the table and fix the fieldsN helper. (cherry picked from commit 35f8d09)
efd6
added a commit
that referenced
this pull request
Jun 7, 2024
Windows 2022 appears to have added new text to the output of netsh. The text is interpreted as having three fields. This impact on the behaviour of the field splitting which expects five. - Originally this would cause a panic due to bounds checking. This was fixed in #39757 by erroring on an unexpectedly short line. - The fieldsN helper expects lines to be n fields or longer, but does not terminate on lines with fewer fields. So treat the first blank line found in the table as the end of the table and fix the fieldsN helper. (cherry picked from commit 35f8d09) Co-authored-by: Dan Kortschak <[email protected]>
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.
Proposed commit message
This improves the error handling for the testing invocation of netsh to allow
the cause of #39698 to be identified.
Checklist
CHANGELOG.next.asciidocorCHANGELOG-developer.next.asciidoc.Disruptive User Impact
Author's Checklist
How to test this PR locally
Related issues
panic: runtime error: index out of range [3] with length 3#39698Use cases
Screenshots
Logs