fix(tsi): close series id iterator after merging #19936
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
foobar
force-pushed
the
fix-use-after-free
branch
2 times, most recently
from
96465f4 to
9ae2bbe
Compare
foobar
force-pushed
the
fix-use-after-free
branch
from
9ae2bbe to
0be081b
Compare
|
@danxmoran can you review this PR ? |
foobar
force-pushed
the
fix-use-after-free
branch
from
0be081b to
38861cf
Compare
danxmoran
reviewed
Feb 9, 2021
| @@ -557,9 +557,10 @@ func IntersectSeriesIDIterators(itr0, itr1 SeriesIDIterator) SeriesIDIterator { | |||
|
|
|||
| // Create series id set, if available. | |||
| if a := NewSeriesIDSetIterators([]SeriesIDIterator{itr0, itr1}); a != nil { | |||
| ss := a[0].SeriesIDSet().And(a[1].SeriesIDSet()) | |||
There was a problem hiding this comment.
Does a[0] == itr0 and a[1] == itr1 here? If so, could we add a comment saying so? I think it'll make it more obvious why the Close() calls have to happen after this
There was a problem hiding this comment.
i added comments. please check if it matches your suggestion.
| @@ -646,10 +647,10 @@ func UnionSeriesIDIterators(itr0, itr1 SeriesIDIterator) SeriesIDIterator { | |||
|
|
|||
| // Create series id set, if available. | |||
| if a := NewSeriesIDSetIterators([]SeriesIDIterator{itr0, itr1}); a != nil { | |||
| itr0.Close() | |||
| itr1.Close() | |||
| ss := NewSeriesIDSet() | |||
| ss.Merge(a[0].SeriesIDSet(), a[1].SeriesIDSet()) | |||
There was a problem hiding this comment.
Same comment / request as above
| @@ -733,9 +734,10 @@ func DifferenceSeriesIDIterators(itr0, itr1 SeriesIDIterator) SeriesIDIterator { | |||
|
|
|||
| // Create series id set, if available. | |||
| if a := NewSeriesIDSetIterators([]SeriesIDIterator{itr0, itr1}); a != nil { | |||
| ss := a[0].SeriesIDSet().AndNot(a[1].SeriesIDSet()) | |||
There was a problem hiding this comment.
Same comment / request as above
This use-after-free bug may lead to segfault. The iterators that have reference to the underlying index files were closed too early while the bitmaps were still used afterwards. If a compaction occurs concurrently and removes the index files, it would result in accessing unmap'd memory address.
foobar
force-pushed
the
fix-use-after-free
branch
from
38861cf to
ee2439b
Compare
danxmoran
approved these changes
Feb 10, 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.
This use-after-free bug may lead to segfault. The iterators that have
reference to the underlying index files were closed too early while
the bitmaps were still used afterwards. If a compaction occurs
concurrently and removes the index files, it would result in accessing
unmap'd memory address.