From 7aaad6b7e2c04f97c1f9472dfeecea9662a35bb4 Mon Sep 17 00:00:00 2001
From: Sebastien Marie <semarie@kapouay.eu.org>
Date: Thu, 11 Apr 2024 08:43:38 +0000
Subject: [PATCH] OpenBSD fix long socket addresses
Original diff from @notgull in #118349, small changes from me.
on OpenBSD, getsockname(2) returns the actual size of the socket address, and
not the len of the content. Figure out the length for ourselves.
see https://marc.info/?l=openbsd-bugs&m=170105481926736&w=2
Fixes #116523
---
library/std/src/os/unix/net/addr.rs | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/library/std/src/os/unix/net/addr.rs b/library/std/src/os/unix/net/addr.rs
index 9757653e02c..1787eba0ef8 100644
--- a/library/std/src/os/unix/net/addr.rs
+++ b/library/std/src/os/unix/net/addr.rs
@@ -107,6 +107,16 @@ impl SocketAddr {
addr: libc::sockaddr_un,
mut len: libc::socklen_t,
) -> io::Result<SocketAddr> {
+ if cfg!(target_os = "openbsd") {
+ // on OpenBSD, getsockname(2) returns the actual size of the socket address,
+ // and not the len of the content. Figure out the length for ourselves.
+ // https://marc.info/?l=openbsd-bugs&m=170105481926736&w=2
+ let sun_path: &[u8] =
+ unsafe { mem::transmute::<&[libc::c_char], &[u8]>(&addr.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);
+ }
+
if len == 0 {
// When there is a datagram from unnamed unix socket
// linux returns zero bytes of address