ext/standard: Fix use-after-free when a polled stream is closed - #23791
Open
nicolas-grekas wants to merge 1 commit into
Open
nicolas-grekas wants to merge 1 commit into
nicolas-grekas wants to merge 1 commit into
Conversation
StreamPollHandle cached the php_stream pointer it was constructed with, while the reference it takes is on the resource. fclose() frees the stream and leaves the resource alive as a closed one, so every later use of the handle read freed memory: Context::add(), Watcher::modifyEvents() and Watcher::remove() crashed in php_stream_cast(), and isValid() returned true. The stream is now resolved from the resource on each use, which gives NULL once it is closed. The call sites already handle SOCK_ERR, so they report the invalid handle the way they were written to.
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
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.
Found while building an
Io\Polldriver for revolt/event-loop.StreamPollHandlecaches thephp_stream *it is constructed with, while the reference it takes is on the resource.fclose()frees the stream and leaves the resource alive as a closed one, so every later use of the handle reads freed memory:isValid()returns true there instead of false, andgetStream()goes through the freed stream to reach the resource the handle already holds.The stream is now resolved from the resource on each use, which gives
NULLonce it is closed.Context::add(),Watcher::modifyEvents()andWatcher::remove()already handleSOCK_ERR, so they throwInvalidHandleExceptionand, forremove(), drop the watcher, the way they were written to.