Skip to content

fix: zero-initialize msghdr first for musl lib build compatibility #2224

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
tedscode wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: zero-initialize msghdr first for musl lib build compatibility #2224

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c7bd2d
fix: zero-init msghdr before field assignment (musl)
tedscode Oct 31, 2025
e0d692b
refactor: removed explicit assignments of null pointers and zero valu…
tedscode Oct 31, 2025
e2cda4e
Restore original import formatting
tedscode Nov 2, 2025
e525841
Merge branch 'master' into msghdr-musl
tedscode Nov 2, 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
40 changes: 22 additions & 18 deletions datagram-socket/src/mmsg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,18 @@ pub fn recvmmsg(fd: BorrowedFd, bufs: &mut [ReadBuf<'_>]) -> io::Result<usize> {

slices.push(IoSlice::new(b));

let mut msg_hdr: libc::msghdr = unsafe { std::mem::zeroed() };
msg_hdr.msg_iov = slices.last_mut().unwrap() as *mut _ as *mut _;
msg_hdr.msg_iovlen = 1;
// Fields below are already zero-initialized by std::mem::zeroed().
// msg_hdr.msg_name = std::ptr::null_mut();
// msg_hdr.msg_namelen = 0;
// msg_hdr.msg_control = std::ptr::null_mut();
// msg_hdr.msg_controllen = 0;
// msg_hdr.msg_flags = 0;

msgvec.push(libc::mmsghdr {
msg_hdr: libc::msghdr {
msg_name: std::ptr::null_mut(),
msg_namelen: 0,
msg_iov: slices.last_mut().unwrap() as *mut _ as *mut _,
msg_iovlen: 1,
msg_control: std::ptr::null_mut(),
msg_controllen: 0,
msg_flags: 0,
},
msg_hdr,
msg_len: buf.capacity().try_into().unwrap(),
});
}
Expand Down Expand Up @@ -115,16 +117,18 @@ pub fn sendmmsg(fd: BorrowedFd, bufs: &[ReadBuf<'_>]) -> io::Result<usize> {
for buf in bufs.iter() {
slices.push(IoSlice::new(buf.filled()));

let mut msg_hdr: libc::msghdr = unsafe { std::mem::zeroed() };
msg_hdr.msg_iov = slices.last_mut().unwrap() as *mut _ as *mut _;
msg_hdr.msg_iovlen = 1;
// Fields below are already zero-initialized by std::mem::zeroed().
// msg_hdr.msg_name = std::ptr::null_mut();
// msg_hdr.msg_namelen = 0;
// msg_hdr.msg_control = std::ptr::null_mut();
// msg_hdr.msg_controllen = 0;
// msg_hdr.msg_flags = 0;

msgvec.push(libc::mmsghdr {
msg_hdr: libc::msghdr {
msg_name: std::ptr::null_mut(),
msg_namelen: 0,
msg_iov: slices.last_mut().unwrap() as *mut _ as *mut _,
msg_iovlen: 1,
msg_control: std::ptr::null_mut(),
msg_controllen: 0,
msg_flags: 0,
},
msg_hdr,
msg_len: buf.capacity().try_into().unwrap(),
});
}
Expand Down