diff options
author | Yuchen Wu <yuchen@cloudflare.com> | 2021-04-01 17:39:30 -0700 |
---|---|---|
committer | Yuchen Wu <yuchen@cloudflare.com> | 2021-04-07 08:00:35 -0700 |
commit | 50fc2dbdfac25b228d7f7907a5ef471ac226b190 (patch) | |
tree | 5f8dffc96f65cd80b28228dda170829f7f9e0e3f /src/sys/socket/mod.rs | |
parent | 6af11c1e70b02e1af36fdc339238d3a117fd3a94 (diff) | |
download | nix-50fc2dbdfac25b228d7f7907a5ef471ac226b190.zip |
Fix spurious errors using `sendmmsg` with multiple cmsgs
Before this fix, the buffer that holds cmsgs may move due to the resize()
call. That causes msg_hdr pointing to invalid memory, which ends up
breaking the sendmmsg() call, resulting in EINVAL.
This change fixes it by avoiding re-allocating the buffers.
Diffstat (limited to 'src/sys/socket/mod.rs')
-rw-r--r-- | src/sys/socket/mod.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs index 2725e57c..76bfa761 100644 --- a/src/sys/socket/mod.rs +++ b/src/sys/socket/mod.rs @@ -1101,23 +1101,22 @@ pub fn sendmmsg<'a, I, C>( let mut output = Vec::<libc::mmsghdr>::with_capacity(reserve_items); - let mut cmsgs_buffer = vec![0u8; 0]; + let mut cmsgs_buffers = Vec::<Vec<u8>>::with_capacity(reserve_items); for d in iter { - let cmsgs_start = cmsgs_buffer.len(); - let cmsgs_required_capacity: usize = d.cmsgs.as_ref().iter().map(|c| c.space()).sum(); - let cmsgs_buffer_need_capacity = cmsgs_start + cmsgs_required_capacity; - cmsgs_buffer.resize(cmsgs_buffer_need_capacity, 0); + let capacity: usize = d.cmsgs.as_ref().iter().map(|c| c.space()).sum(); + let mut cmsgs_buffer = vec![0u8; capacity]; output.push(libc::mmsghdr { msg_hdr: pack_mhdr_to_send( - &mut cmsgs_buffer[cmsgs_start..], + &mut cmsgs_buffer, &d.iov, &d.cmsgs, d.addr.as_ref() ), msg_len: 0, }); + cmsgs_buffers.push(cmsgs_buffer); }; let ret = unsafe { libc::sendmmsg(fd, output.as_mut_ptr(), output.len() as _, flags.bits() as _) }; |