Skip to content

yamux/frame: Ensure frame io does not panic on invalid write results #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jxs merged 3 commits into from
Jul 17, 2025
Merged

yamux/frame: Ensure frame io does not panic on invalid write results #202

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94873a8
yamux/frame: Ensure frame io does not panic on invalid write results
lexnv Jul 14, 2025
a0a1ca9
Merge branch 'master' into lexnv/guard-out-of-range
jxs Jul 15, 2025
cefd39a
frame/io: Apply clippy
lexnv Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions yamux/src/frame/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ impl<T: AsyncRead + AsyncWrite + Unpin> Sink<Frame<()>> for Io<T> {
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()));
}
*offset += n;

if *offset > header.len() {
return Poll::Ready(Err(io::Error::other(format!(
"Writer header returned invalid write count n={n}: {offset} > {} ",
header.len(),
))));
}

if *offset == header.len() {
if !buffer.is_empty() {
let buffer = std::mem::take(buffer);
Expand All @@ -122,6 +130,14 @@ impl<T: AsyncRead + AsyncWrite + Unpin> Sink<Frame<()>> for Io<T> {
return Poll::Ready(Err(io::ErrorKind::WriteZero.into()));
}
*offset += n;

if *offset > buffer.len() {
return Poll::Ready(Err(io::Error::other(format!(
"Writer body returned invalid write count n={n}: {offset} > {} ",
buffer.len(),
))));
}

if *offset == buffer.len() {
this.write_state = WriteState::Init;
}
Expand Down