Fix TSM UnmarshalBinary panic #6170
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
Writing a key that exceeds the max key length could cause a panic when reading a tsm file because the 2 bytes used for the key length would not be enough to represent the actual key length. The writer will now return an error if when trying to write a key that is too large.
|
LGTM. |
| t.Fatalf("unexpected error created writer: %v", err) | ||
| } | ||
|
|
||
| var key string |
There was a problem hiding this comment.
What about doing this instead?
var key = make([]byte,100000)
for i := range key { key[i] = 'a' }
And then just pass string(key) to w.Write(). I know it's "just a test", but I don't like that we'd be creating over 100000 strings here.
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.
Required for all non-trivial PRs
If writing points ended up creating a key (measurement + tag sets) that was larger than 65535 bytes, it could overflow the length bytes in the the TSM index causing a panic when opening the file:
I was able to reproduce this panic in a test by writing a key of 100k bytes.
This PR checks for that condition in the TSM writer so that an error is returned if a large key is written. It also adds validation to
models.Pointto prevent creating a point that would exceed the max key length.May fix #6121 #6022 #6054 #5202