mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't set cmsg fields in msghdr if we have no cmsg to send

Browse Source
This commit is contained in:
The 8472 2023-11-19 15:19:47 +01:00
parent 12efa53b19
commit f34e7f4768
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/std/src/sys/unix/process/process_unix.rs
View File

@ -698,11 +698,12 @@ impl Command {
msg.msg_iov = &mut iov as *mut _ as *mut _; msg.msg_iov = &mut iov as *mut _ as *mut _;
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
msg.msg_controllen = mem::size_of_val(&cmsg.buf) as _;
msg.msg_control = &mut cmsg.buf as *mut _ as *mut _;
// only attach cmsg if we successfully acquired the pidfd // only attach cmsg if we successfully acquired the pidfd
if pidfd >= 0 { if pidfd >= 0 {
msg.msg_controllen = mem::size_of_val(&cmsg.buf) as _;
msg.msg_control = &mut cmsg.buf as *mut _ as *mut _;
let hdr = CMSG_FIRSTHDR(&mut msg as *mut _ as *mut _); let hdr = CMSG_FIRSTHDR(&mut msg as *mut _ as *mut _);
(*hdr).cmsg_level = SOL_SOCKET; (*hdr).cmsg_level = SOL_SOCKET;
(*hdr).cmsg_type = SCM_RIGHTS; (*hdr).cmsg_type = SCM_RIGHTS;
@ -719,7 +720,7 @@ impl Command {
// so we get a consistent SEQPACKET order // so we get a consistent SEQPACKET order
match cvt_r(|| libc::sendmsg(sock.as_raw(), &msg, 0)) { match cvt_r(|| libc::sendmsg(sock.as_raw(), &msg, 0)) {
Ok(0) => {} Ok(0) => {}
_ => rtabort!("failed to communicate with parent process"), other => rtabort!("failed to communicate with parent process. {:?}", other),
} }
} }
} }