Cleanup windows pid shm stuff

Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>

Author: bwoebi

datadog-ipc/src/platform/windows/sockets.rs

@@ -37,6 +37,7 @@ use tokio::net::windows::named_pipe::{NamedPipeClient, NamedPipeServer};
 use winapi::shared::minwindef::ULONG;
 use winapi::shared::winerror::ERROR_PIPE_CONNECTED;
 use winapi::um::handleapi::{CloseHandle, DuplicateHandle, INVALID_HANDLE_VALUE};
+use winapi::um::minwinbase::SECURITY_ATTRIBUTES;
 use winapi::um::processthreadsapi::{GetCurrentProcess, GetCurrentProcessId, OpenProcess};
 use winapi::um::winbase::{GetNamedPipeClientProcessId, GetNamedPipeServerProcessId};
 use winapi::um::winnt::{DUPLICATE_SAME_ACCESS, HANDLE, PROCESS_DUP_HANDLE};
@@ -241,6 +242,11 @@ fn create_pipe_server(name: &[u8], first_instance: bool) -> io::Result<OwnedHand
 
     let h = unsafe {
         let buf_size = PIPE_BUFFER_SIZE.load(Ordering::Relaxed) as u32;
+        let mut sec_attributes = SECURITY_ATTRIBUTES {
+            nLength: std::mem::size_of::<SECURITY_ATTRIBUTES>() as u32,
+            lpSecurityDescriptor: null_mut(),
+            bInheritHandle: 1, // We want this one to be inherited
+        };
         CreateNamedPipeA(
             name.as_ptr(),
             open_mode,
@@ -249,7 +255,7 @@ fn create_pipe_server(name: &[u8], first_instance: bool) -> io::Result<OwnedHand
             buf_size,
             buf_size,
             0,
-            null_mut(),
+            &mut sec_attributes as *mut SECURITY_ATTRIBUTES as *mut _,
         )
     };
 

datadog-sidecar/src/setup/windows.rs

@@ -6,7 +6,6 @@ use crate::setup::Liaison;
 use datadog_ipc::platform::PIPE_PATH;
 use datadog_ipc::{SeqpacketConn, SeqpacketListener};
 use libc::getpid;
-use std::ffi::CString;
 use std::io;
 
 pub type IpcClient = SeqpacketConn;
@@ -69,11 +68,6 @@ impl Default for NamedPipeLiaison {
 
 pub type DefaultLiason = NamedPipeLiaison;
 
-/// Helper: derive the shared-memory path used to publish the sidecar PID.
-pub fn pid_shm_path(pipe_path: &str) -> CString {
-    #[allow(clippy::unwrap_used)]
-    CString::new(&pipe_path[PIPE_PATH.len() - 1..]).unwrap()
-}
 
 #[cfg(test)]
 mod tests {

datadog-sidecar/src/windows.rs

@@ -2,10 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::enter_listener_loop;
-use crate::setup::pid_shm_path;
-use datadog_ipc::platform::{
-    named_pipe_name_from_raw_handle, FileBackedHandle, MappedMem, NamedShmHandle,
-};
+use datadog_ipc::platform::named_pipe_name_from_raw_handle;
 use datadog_ipc::{SeqpacketConn, SeqpacketListener};
 
 use futures::FutureExt;
@@ -62,19 +59,6 @@ pub extern "C" fn ddog_daemon_entry_point(_trampoline_data: &TrampolineData) {
     let pid = unsafe { libc::getpid() };
 
     if let Some(handle) = spawn_worker::recv_passed_handle() {
-        let mut shm = match named_pipe_name_from_raw_handle(handle.as_raw_handle())
-            .ok_or(io::Error::from(io::ErrorKind::InvalidInput))
-            .and_then(|name| NamedShmHandle::create(pid_shm_path(&name), 4))
-            .and_then(FileBackedHandle::map)
-        {
-            Ok(ok) => ok,
-            Err(err) => {
-                error!("Couldn't store pid to shared memory: {err}");
-                return;
-            }
-        };
-        shm.as_slice_mut().copy_from_slice(&pid.to_ne_bytes());
-
         info!("Starting sidecar, pid: {}", pid);
 
         let acquire_listener = move || {
@@ -88,10 +72,8 @@ pub extern "C" fn ddog_daemon_entry_point(_trampoline_data: &TrampolineData) {
                 }
             };
 
-            // We pass the shm to ensure we drop the shm handle with the pid immediately after
-            // cancellation To avoid actual race conditions
             Ok((
-                |handler| accept_socket_loop(listener, closed_future, handler, shm),
+                |handler| accept_socket_loop(listener, closed_future, handler),
                 cancel,
             ))
         };
@@ -112,7 +94,6 @@ async fn accept_socket_loop(
     listener: SeqpacketListener,
     cancellation: ManualFuture<()>,
     handler: Box<dyn Fn(SeqpacketConn)>,
-    _: MappedMem<NamedShmHandle>,
 ) -> io::Result<()> {
     // Wrap the first server instance as a Tokio NamedPipeServer for async connect polling.
     // After each accepted connection we create a fresh Tokio server for the next client.
@@ -144,7 +125,6 @@ async fn accept_socket_loop(
         let conn = SeqpacketConn::from_server_handle(owned, client_pid);
         handler(conn);
     }
-    // drops pipe and shm here
     Ok(())
 }