Merge pull request #2095 from asomers/recvmsg-lifetime

Fix an incorrect lifetime in the return value of recvmsg

Author: asomers

CHANGELOG.md

@@ -68,6 +68,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   `SockaddrIn6::from<std::net::SockaddrV6>`, `IpMembershipRequest::new`, and
   `Ipv6MembershipRequest::new` with future Rust versions.
   ([#2061](https://github.com/nix-rust/nix/pull/2061))
+- Fixed an incorrect lifetime returned from `recvmsg`.
+  ([#2095](https://github.com/nix-rust/nix/pull/2095))
 
 ### Removed
 

src/sys/socket/mod.rs

@@ -2058,7 +2058,7 @@ fn pack_mhdr_to_send<'a, I, C, S>(
 /// [recvmsg(2)](https://pubs.opengroup.org/onlinepubs/9699919799/functions/recvmsg.html)
 pub fn recvmsg<'a, 'outer, 'inner, S>(fd: RawFd, iov: &'outer mut [IoSliceMut<'inner>],
                    mut cmsg_buffer: Option<&'a mut Vec<u8>>,
-                   flags: MsgFlags) -> Result<RecvMsg<'a, 'inner, S>>
+                   flags: MsgFlags) -> Result<RecvMsg<'a, 'outer, S>>
     where S: SockaddrLike + 'a,
     'inner: 'outer
 {

test/sys/test_socket.rs

@@ -239,13 +239,10 @@ pub fn test_recvmsg_sockaddr_un() {
 
     // Receive the message
     let mut recv_buffer = [0u8; 32];
-    let received = socket::recvmsg(
-        sock.as_raw_fd(),
-        &mut [std::io::IoSliceMut::new(&mut recv_buffer)],
-        None,
-        MsgFlags::empty(),
-    )
-    .unwrap();
+    let mut iov = [std::io::IoSliceMut::new(&mut recv_buffer)];
+    let received =
+        socket::recvmsg(sock.as_raw_fd(), &mut iov, None, MsgFlags::empty())
+            .unwrap();
     // Check the address in the received message
     assert_eq!(sockaddr, received.address.unwrap());
 }