Skip to content

backport 1.16: scaled range timer: guard against queue deletion during timer fire (#…#15007

Merged
antoniovicente merged 3 commits intoenvoyproxy:release/v1.16from
Shikugawa:backport-1.16/14799
Feb 11, 2021
Merged

backport 1.16: scaled range timer: guard against queue deletion during timer fire (#…#15007
antoniovicente merged 3 commits intoenvoyproxy:release/v1.16from
Shikugawa:backport-1.16/14799

Conversation

@Shikugawa
Copy link
Member

…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:]

…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>
@Shikugawa Shikugawa requested a review from akonradi February 10, 2021 02:01
Signed-off-by: Shikugawa <rei@tetrate.io>
Copy link
Contributor

@akonradi akonradi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a line to the release notes about the bug fix

@antoniovicente
Copy link
Contributor

Waiting for release note to be copied from #15018

/wait

Signed-off-by: Shikugawa <rei@tetrate.io>
@antoniovicente antoniovicente merged commit 7d45fe9 into envoyproxy:release/v1.16 Feb 11, 2021
@Shikugawa Shikugawa deleted the backport-1.16/14799 branch February 26, 2021 03:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants