gsadmin/noq
1
0
Fork 0
mirror of https://github.com/n0-computer/noq.git synced 2026-09-21 02:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace uses of mem::uninitialized with mem::MaybeUninit

Browse Source
This commit is contained in:
Benjamin Saunders
2019-07-06 14:24:36 -07:00
committed by Dirkjan Ochtman
parent 2a29b77c35
commit 26abc4bb6e
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quinn/src/platform/cmsg.rs
+3 -4
View File
@@ -15,11 +15,10 @@ pub struct Encoder<'a> {
impl<'a> Encoder<'a> {
/// # Safety
/// - `buf` must have the alignment of `cmsghdr`.
/// - `hdr.msg_control` must be a suitably aligned pointer to `hdr.msg_controllen` bytes that
/// can be safely written
/// - The `Encoder` must be dropped before `hdr` is passed to a system call, and must not be leaked.
pub unsafe fn new(hdr: &'a mut libc::msghdr, buf: &'a mut [u8]) -> Self {
hdr.msg_control = buf.as_mut_ptr() as _;
hdr.msg_controllen = buf.len() as _;
pub unsafe fn new(hdr: &'a mut libc::msghdr) -> Self {
Self {
cmsg: libc::CMSG_FIRSTHDR(hdr).as_mut(),
hdr,
quinn/src/platform/unix.rs
+13 -9
View File
@@ -1,6 +1,7 @@
use std::os::unix::io::AsRawFd;
use std::{
io, mem,
io,
mem::{self, MaybeUninit},
net::{SocketAddr, SocketAddrV4, SocketAddrV6},
ptr,
};
@@ -97,13 +98,16 @@ impl super::UdpExt for UdpSocket {
hdr.msg_control = ptr::null_mut();
hdr.msg_controllen = 0;
hdr.msg_flags = 0;
let mut ctrl: cmsg::Aligned<[u8; CMSG_LEN]> =
cmsg::Aligned(unsafe { mem::uninitialized() });
// We may never fully initialize this, and it's only written/read via `ptr::write`/syscalls,
// so no `assume_init` call can or should be made.
let mut ctrl = cmsg::Aligned(MaybeUninit::<[u8; CMSG_LEN]>::uninit());
hdr.msg_control = ctrl.0.as_mut_ptr() as _;
hdr.msg_controllen = CMSG_LEN as _;
let is_ipv4 = match remote {
SocketAddr::V4(_) => true,
SocketAddr::V6(ref addr) => addr.ip().segments().starts_with(&[0, 0, 0, 0, 0, 0xffff]),
};
let mut encoder = unsafe { cmsg::Encoder::new(&mut hdr, &mut ctrl.0) };
let mut encoder = unsafe { cmsg::Encoder::new(&mut hdr) };
if is_ipv4 {
encoder.push(libc::IPPROTO_IP, libc::IP_TOS, ecn as IpTosTy);
} else {
@@ -124,15 +128,14 @@ impl super::UdpExt for UdpSocket {
}
fn recv_ext(&self, buf: &mut [u8]) -> io::Result<(usize, SocketAddr, Option<EcnCodepoint>)> {
let mut name: libc::sockaddr_storage = unsafe { mem::uninitialized() };
let mut name = MaybeUninit::<libc::sockaddr_storage>::uninit();
let mut iov = libc::iovec {
iov_base: buf.as_ptr() as *mut _,
iov_len: buf.len(),
};
let mut ctrl: cmsg::Aligned<[u8; CMSG_LEN]> =
cmsg::Aligned(unsafe { mem::uninitialized() });
let mut hdr: libc::msghdr = unsafe { mem::zeroed() };
hdr.msg_name = &mut name as *mut _ as _;
let mut ctrl = cmsg::Aligned(MaybeUninit::<[u8; CMSG_LEN]>::uninit());
let mut hdr = unsafe { mem::zeroed::<libc::msghdr>() };
hdr.msg_name = name.as_mut_ptr() as _;
hdr.msg_namelen = mem::size_of::<libc::sockaddr_storage>() as _;
hdr.msg_iov = &mut iov;
hdr.msg_iovlen = 1;
@@ -150,6 +153,7 @@ impl super::UdpExt for UdpSocket {
}
break n;
};
let name = unsafe { name.assume_init() };
let ecn_bits = match unsafe { cmsg::Iter::new(&hdr).next() } {
Some(cmsg) => match (cmsg.cmsg_level, cmsg.cmsg_type) {
// FreeBSD uses IP_RECVTOS here, and we can be liberal because cmsgs are opt-in.