Fix use-after-free in StreamPollHandle when its stream is closed - #23804
Closed
nicolas-grekas wants to merge 1 commit into
Closed
nicolas-grekas wants to merge 1 commit into
nicolas-grekas wants to merge 1 commit into
Conversation
StreamPollHandle takes a reference on the resource but caches the php_stream pointer it was given at construction. fclose() frees that stream while the resource stays alive, so Watcher::remove(), Watcher::modifyEvents() and StreamPollHandle::isValid() dereference freed memory. Resolve the stream from the resource instead: res->ptr is NULL once the stream is closed, which the existing SOCK_ERR paths already handle.
Contributor
Author
|
Duplicate of #23791, which came first and resolves the stream through |
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.
StreamPollHandletakes a reference on the resource, but it caches thephp_stream *it was given at construction.fclose()frees that stream while the resource stays alive, so anything that reaches the handle afterwards works on freed memory:Resolving the stream from the resource is enough:
res->ptris NULL once it is closed, and theSOCK_ERRpaths that are already there then do the right thing -remove()skips the poll context,modifyEvents()throwsInvalidHandleException,isValid()returns false, andwait()ignores the watcher.getStream()returns the closed resource, which is what the polyfill does too.I hit this while writing an event loop driver on top of the API. Closing a socket before cancelling its watcher is a user mistake, but it should not crash.
BTW
StreamPollHandle::getFileDescriptor()is implemented but not in the stub, so it is dead code at the moment - remove it or expose it?/cc @bukka @iluuu1994