Skip to content

socket: remove UB from MaybeUninit<T>.assume_init #2717

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

Open
xtqqczze wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

socket: remove UB from MaybeUninit<T>.assume_init #2717

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
8 changes: 4 additions & 4 deletions src/sys/socket/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@ pub fn recvfrom<T: SockaddrLike>(
) -> Result<(usize, Option<T>)> {
unsafe {
let mut addr = mem::MaybeUninit::<T>::uninit();
let mut len = mem::size_of_val(&addr) as socklen_t;
let mut len = T::size();

let ret = Errno::result(libc::recvfrom(
sockfd,
Expand All @@ -2418,7 +2418,7 @@ pub fn recvfrom<T: SockaddrLike>(
&mut len as *mut socklen_t,
))? as usize;

Ok((ret, T::from_raw(addr.assume_init().as_ptr(), Some(len))))
Ok((ret, T::from_raw(addr.as_ptr().cast(), Some(len))))
}
}

Expand Down Expand Up @@ -2521,7 +2521,7 @@ pub fn getpeername<T: SockaddrLike>(fd: RawFd) -> Result<T> {

Errno::result(ret)?;

T::from_raw(addr.assume_init().as_ptr(), Some(len)).ok_or(Errno::EINVAL)
T::from_raw(addr.as_ptr().cast(), Some(len)).ok_or(Errno::EINVAL)
}
}

Expand All @@ -2537,7 +2537,7 @@ pub fn getsockname<T: SockaddrLike>(fd: RawFd) -> Result<T> {

Errno::result(ret)?;

T::from_raw(addr.assume_init().as_ptr(), Some(len)).ok_or(Errno::EINVAL)
T::from_raw(addr.as_ptr().cast(), Some(len)).ok_or(Errno::EINVAL)
}
}

Expand Down