Avoid prematurely unlinking streams in send_reset, in some cases.#319
Merged
Conversation
Because `send_reset` called `recv_err`, which calls `reclaim_all_capacity`, which eventually calls `transition(stream, ..)` -- all of which happens _before_ the RESET frame is enqueued -- it was possible for the stream to get unlinked from the store (if there was any connection-level capacity to reassign). This could then cause the stream to get "leaked" on drop/EOF since it would no longer be iterated. Fix this by delaying the call to `reclaim_all_capacity` _after_ enqueueing the RESET frame. A test demonstrating the issue is included.
carllerche
approved these changes
Oct 16, 2018
Collaborator
carllerche
left a comment
carllerche
left a comment
There was a problem hiding this comment.
Makes sense. Thanks for the explanation and the test 👍 .
Collaborator
|
Unfortunately, the build is broken due to an unrelated problem. I will work on fixing that. |
Collaborator
|
I submitted #321 to fix the build. |
goffrie
added a commit
to goffrie/h2
that referenced
this pull request
Oct 26, 2018
This is how I found hyperium#319 and hyperium#320.
carllerche
pushed a commit
that referenced
this pull request
Oct 29, 2018
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.
Because
send_resetcalledrecv_err, which callsreclaim_all_capacity,which eventually calls
transition(stream, ..)-- all of which happens beforethe RESET frame is enqueued -- it was possible for the stream to get unlinked
from the store (if there was any connection-level capacity to reassign). This
could then cause the stream to get "leaked" on drop/EOF since it would no longer
be iterated.
Fix this by delaying the call to
reclaim_all_capacityafter enqueueing theRESET frame.
A test demonstrating the issue is included.