Skip to content

std: Fix size returned by UEFI tcp4 read operations #150986

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
rust-bors merged 1 commit into from
Jan 12, 2026
+5 −4
Merged

std: Fix size returned by UEFI tcp4 read operations #150986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions library/std/src/sys/net/connection/uefi/tcp4.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ impl Tcp4 {
fragment_table: [fragment],
};

self.read_inner((&raw mut rx_data).cast(), timeout).map(|_| data_len as usize)
self.read_inner((&raw mut rx_data).cast(), timeout)
}

pub(crate) fn read_vectored(
Expand Down Expand Up @@ -288,14 +288,14 @@ impl Tcp4 {
);
};

self.read_inner(rx_data.as_mut_ptr(), timeout).map(|_| data_length as usize)
self.read_inner(rx_data.as_mut_ptr(), timeout)
}

pub(crate) fn read_inner(
&self,
rx_data: *mut tcp4::ReceiveData,
timeout: Option<Duration>,
) -> io::Result<()> {
) -> io::Result<usize> {
let evt = unsafe { self.create_evt() }?;
let completion_token =
tcp4::CompletionToken { event: evt.as_ptr(), status: Status::SUCCESS };
Expand All @@ -313,7 +313,8 @@ impl Tcp4 {
if completion_token.status.is_error() {
Err(io::Error::from_raw_os_error(completion_token.status.as_usize()))
} else {
Ok(())
let data_length = unsafe { (*rx_data).data_length };
Ok(data_length as usize)
}
}

Expand Down
Loading