Add regression tests for vuln-88 and harden checkSignal() - #6951
Merged
Conversation
vuln-88 itself is already fixed: PipeLocked::releaseSource() nulls `source` before releasing and is idempotent, so doError()'s second release is a no-op. These tests pin that behaviour down. The deterministic test re-pipes the readable from the destination's abort listener, so a stale source reference would tear down an unrelated pipe; it asserts rs.locked instead of relying on a crash, because PipeLocked lives inline in a kj::OneOf and is never heap freed, so ASAN cannot see the corruption. The second test is the raw crash repro: it re-locks the readable with a reader, leaving a non-polymorphic ReaderLocked where the stale reference points. checkSignal() must not touch *this after releaseSource(), which can run the source's cancel algorithm and let user JS destroy it. That was upheld by copying three flags into locals. Copy the Flags struct once instead, and move the tail into a static finishAbortedPipe() so the compiler enforces the rule rather than a comment.
Contributor
|
Everything looks correct. Let me now summarize my review findings. The C++ changes are sound:
The tests are well-structured:
No issues found. LGTM |
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.
vuln-88 itself is already fixed: PipeLocked::releaseSource() nulls
sourcebefore releasing and is idempotent, so doError()'s second release is a no-op. These tests pin that behaviour down.The deterministic test re-pipes the readable from the destination's abort listener, so a stale source reference would tear down an unrelated pipe; it asserts rs.locked instead of relying on a crash, because PipeLocked lives inline in a kj::OneOf and is never heap freed, so ASAN cannot see the corruption. The second test is the raw crash repro: it re-locks the readable with a reader, leaving a non-polymorphic ReaderLocked where the stale reference points.
checkSignal() must not touch *this after releaseSource(), which can run the source's cancel algorithm and let user JS destroy it. That was upheld by copying three flags into locals. Copy the Flags struct once instead, and move the tail into a static finishAbortedPipe() so the compiler enforces the rule rather than a comment.