mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #130861 - cuviper:sun-path-offset, r=ibraheemdev

Browse source 
Use `mem::offset_of!` for `sockaddr_un.sun_path`

We don't need manual pointer math here anymore!

try-job: dist-i686-msvc
This commit is contained in:
Guillaume Gomez 2024-09-27 00:43:33 +02:00 • committed by GitHub
commit 329f9fcb05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
library/std/src/os/unix/net/addr.rs
View file

@ -15,15 +15,12 @@ mod libc {
pub type socklen_t = u32; pub type socklen_t = u32;
pub struct sockaddr; pub struct sockaddr;
#[derive(Clone)] #[derive(Clone)]
pub struct sockaddr_un; pub struct sockaddr_un {
pub sun_path: [u8; 1],
}
} }
fn sun_path_offset(addr: &libc::sockaddr_un) -> usize { const SUN_PATH_OFFSET: usize = mem::offset_of!(libc::sockaddr_un, sun_path);
// Work with an actual instance of the type since using a null pointer is UB
let base = (addr as *const libc::sockaddr_un).addr();
let path = core::ptr::addr_of!(addr.sun_path).addr();
path - base
}
pub(super) fn sockaddr_un(path: &Path) -> io::Result<(libc::sockaddr_un, libc::socklen_t)> { pub(super) fn sockaddr_un(path: &Path) -> io::Result<(libc::sockaddr_un, libc::socklen_t)> {
// SAFETY: All zeros is a valid representation for `sockaddr_un`. // SAFETY: All zeros is a valid representation for `sockaddr_un`.
@ -53,7 +50,7 @@ pub(super) fn sockaddr_un(path: &Path) -> io::Result<(libc::sockaddr_un, libc::s
ptr::copy_nonoverlapping(bytes.as_ptr(), addr.sun_path.as_mut_ptr().cast(), bytes.len()) ptr::copy_nonoverlapping(bytes.as_ptr(), addr.sun_path.as_mut_ptr().cast(), bytes.len())
}; };
let mut len = sun_path_offset(&addr) + bytes.len(); let mut len = SUN_PATH_OFFSET + bytes.len();
match bytes.get(0) { match bytes.get(0) {
Some(&0) | None => {} Some(&0) | None => {}
Some(_) => len += 1, Some(_) => len += 1,
@ -114,13 +111,13 @@ impl SocketAddr {
let sun_path: &[u8] = let sun_path: &[u8] =
unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&addr.sun_path) }; unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&addr.sun_path) };
len = core::slice::memchr::memchr(0, sun_path) len = core::slice::memchr::memchr(0, sun_path)
.map_or(len, |new_len| (new_len + sun_path_offset(&addr)) as libc::socklen_t); .map_or(len, |new_len| (new_len + SUN_PATH_OFFSET) as libc::socklen_t);
} }
if len == 0 { if len == 0 {
// When there is a datagram from unnamed unix socket // When there is a datagram from unnamed unix socket
// linux returns zero bytes of address // linux returns zero bytes of address
len = sun_path_offset(&addr) as libc::socklen_t; // i.e., zero-length address len = SUN_PATH_OFFSET as libc::socklen_t; // i.e., zero-length address
} else if addr.sun_family != libc::AF_UNIX as libc::sa_family_t { } else if addr.sun_family != libc::AF_UNIX as libc::sa_family_t {
return Err(io::const_io_error!( return Err(io::const_io_error!(
io::ErrorKind::InvalidInput, io::ErrorKind::InvalidInput,
@ -238,7 +235,7 @@ impl SocketAddr {
} }
fn address(&self) -> AddressKind<'_> { fn address(&self) -> AddressKind<'_> {
let len = self.len as usize - sun_path_offset(&self.addr); let len = self.len as usize - SUN_PATH_OFFSET;
let path = unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&self.addr.sun_path) }; let path = unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&self.addr.sun_path) };
// macOS seems to return a len of 16 and a zeroed sun_path for unnamed addresses // macOS seems to return a len of 16 and a zeroed sun_path for unnamed addresses
@ -287,7 +284,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
addr.sun_path.as_mut_ptr().add(1) as *mut u8, addr.sun_path.as_mut_ptr().add(1) as *mut u8,
name.len(), name.len(),
); );
let len = (sun_path_offset(&addr) + 1 + name.len()) as libc::socklen_t; let len = (SUN_PATH_OFFSET + 1 + name.len()) as libc::socklen_t;
SocketAddr::from_parts(addr, len) SocketAddr::from_parts(addr, len)
} }
} }