From a2b18aad5193892ebc7460e9962e0aa4e716f201 Mon Sep 17 00:00:00 2001
From: mox692 <moymoymox@gmail.com>
Date: Thu, 12 Sep 2024 00:07:45 +0900
Subject: [PATCH] net: fix handling of leading zero byte in
 `from_abstract_name`

---
 tokio/src/net/unix/listener.rs |  2 +-
 tokio/src/net/unix/stream.rs   |  2 +-
 tokio/tests/uds_stream.rs      | 12 +++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tokio/src/net/unix/listener.rs b/tokio/src/net/unix/listener.rs
index ddd9669f6d1..9977020a283 100644
--- a/tokio/src/net/unix/listener.rs
+++ b/tokio/src/net/unix/listener.rs
@@ -81,7 +81,7 @@ impl UnixListener {
         let addr = {
             let os_str_bytes = path.as_ref().as_os_str().as_bytes();
             if os_str_bytes.starts_with(b"\0") {
-                StdSocketAddr::from_abstract_name(os_str_bytes)?
+                StdSocketAddr::from_abstract_name(&os_str_bytes[1..])?
             } else {
                 StdSocketAddr::from_pathname(path)?
             }
diff --git a/tokio/src/net/unix/stream.rs b/tokio/src/net/unix/stream.rs
index 466ed21c02e..4c93c646439 100644
--- a/tokio/src/net/unix/stream.rs
+++ b/tokio/src/net/unix/stream.rs
@@ -77,7 +77,7 @@ impl UnixStream {
         let addr = {
             let os_str_bytes = path.as_ref().as_os_str().as_bytes();
             if os_str_bytes.starts_with(b"\0") {
-                StdSocketAddr::from_abstract_name(os_str_bytes)?
+                StdSocketAddr::from_abstract_name(&os_str_bytes[1..])?
             } else {
                 StdSocketAddr::from_pathname(path)?
             }
diff --git a/tokio/tests/uds_stream.rs b/tokio/tests/uds_stream.rs
index 626a96fa31e..37e53aafcd2 100644
--- a/tokio/tests/uds_stream.rs
+++ b/tokio/tests/uds_stream.rs
@@ -3,6 +3,10 @@
 #![cfg(unix)]
 
 use std::io;
+#[cfg(target_os = "android")]
+use std::os::android::net::SocketAddrExt;
+#[cfg(target_os = "linux")]
+use std::os::linux::net::SocketAddrExt;
 use std::task::Poll;
 
 use tokio::io::{AsyncReadExt, AsyncWriteExt, Interest};
@@ -431,5 +435,11 @@ async fn abstract_socket_name() {
     let accept = listener.accept();
     let connect = UnixStream::connect(&socket_path);
 
-    try_join(accept, connect).await.unwrap();
+    let ((stream, _), _) = try_join(accept, connect).await.unwrap();
+
+    let local_addr = stream.into_std().unwrap().local_addr().unwrap();
+    let abstract_path_name = local_addr.as_abstract_name().unwrap();
+
+    // `as_abstract_name` removes leading zero bytes
+    assert_eq!(abstract_path_name, b"aaa");
 }