feat: truncate Ipv4 and Ipv6 packets to the number of bytes read from…

… the socket
fujiapple852 · Oct 6, 2023 · 2693490 · 2693490
1 parent 55eb028
commit 2693490
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/tracing/net/ipv4.rs b/src/tracing/net/ipv4.rs
@@ -189,8 +189,8 @@ pub fn recv_icmp_probe<S: Socket>(
 ) -> TraceResult<Option<ProbeResponse>> {
     let mut buf = [0_u8; MAX_PACKET_SIZE];
     match recv_socket.read(&mut buf) {
-        Ok(_bytes_read) => {
-            let ipv4 = Ipv4Packet::new_view(&buf).req()?;
+        Ok(bytes_read) => {
+            let ipv4 = Ipv4Packet::new_view(&buf[..bytes_read]).req()?;
             Ok(extract_probe_resp(protocol, &ipv4)?)
         }
         Err(err) => match err.kind() {

diff --git a/src/tracing/net/ipv6.rs b/src/tracing/net/ipv6.rs
@@ -141,8 +141,8 @@ pub fn recv_icmp_probe<S: Socket>(
 ) -> TraceResult<Option<ProbeResponse>> {
     let mut buf = [0_u8; MAX_PACKET_SIZE];
     match recv_socket.recv_from(&mut buf) {
-        Ok((_bytes_read, addr)) => {
-            let icmp_v6 = IcmpPacket::new_view(&buf).req()?;
+        Ok((bytes_read, addr)) => {
+            let icmp_v6 = IcmpPacket::new_view(&buf[..bytes_read]).req()?;
             let src_addr = match addr.as_ref().req()? {
                 SocketAddr::V6(addr) => addr.ip(),
                 SocketAddr::V4(_) => panic!(),