Fix heap-buffer-overflow in ModbusLayer on truncated packets#2159
Open
SAY-5 wants to merge 1 commit into
Open
Conversation
Signed-off-by: Sai Asish Y <say.apm35@gmail.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev #2159 +/- ##
========================================
Coverage 82.72% 82.72%
========================================
Files 332 332
Lines 59807 59811 +4
Branches 12591 12298 -293
========================================
+ Hits 49475 49480 +5
- Misses 8947 8979 +32
+ Partials 1385 1352 -33
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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
2 participants
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.
Fixes #2155
A TCP packet to port 502 with fewer than 8 payload bytes was still parsed as a ModbusLayer, so the header getters (getTransactionId, getLength, toString, etc.) read past the end of the buffer. This adds a ModbusLayer::isDataValid check on the payload length before constructing the layer, matching how GtpV2Layer and BgpLayer guard their parsing. Added a regression test with a truncated Modbus packet that fails without the guard.