backport 1.17: scaled range timer: guard against queue deletion during timer fire (#…#15006
Merged
antoniovicente merged 2 commits intoenvoyproxy:release/v1.17from Feb 11, 2021
Merged
Conversation
…nvoyproxy#14799) Fix a potential use-after-free error in ScaledRangeTimerManagerImpl by adding a processing_timers_ flag to the timer queues that is set during onQueueTimerFired processing. This flag is checked when a timer is removed to ensure that the timer's queue isn't deleted while it is in a callback triggered by onQueueTimerFired. Signed-off-by: Craig Radcliffe <craig.radcliffe@broadcom.com> Signed-off-by: Shikugawa <rei@tetrate.io>
akonradi
approved these changes
Feb 10, 2021
Contributor
|
Wait, this should definitely go in the release notes. |
akonradi
suggested changes
Feb 10, 2021
Contributor
akonradi
left a comment
akonradi
left a comment
There was a problem hiding this comment.
Please note the bug fix in the release notes
Contributor
We need a release note in the main branch also. I missed that during the original PR review. |
Contributor
|
#15018 adds release notes for main; once that's merged we can add the same thing here. |
Contributor
|
Waiting for release note to be copied from #15018 /wait |
Signed-off-by: Shikugawa <rei@tetrate.io>
antoniovicente
approved these changes
Feb 11, 2021
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
3 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.
…14799)
Fix a potential use-after-free error in ScaledRangeTimerManagerImpl by adding a processing_timers_ flag to the timer queues that is set during onQueueTimerFired processing. This flag is checked when a timer is removed to ensure that the timer's queue isn't deleted while it is in a callback triggered by onQueueTimerFired.
Signed-off-by: Craig Radcliffe craig.radcliffe@broadcom.com
Signed-off-by: Shikugawa rei@tetrate.io
For an explanation of how to fill out the fields, please see the relevant section
in PULL_REQUESTS.md
Commit Message:
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Deprecated:]
[Optional API Considerations:]