Merge pull request #82 from shellrow/fix-rtm-error-handling

Fix RTM error handling
shellrow · Jul 6, 2024 · ce575b1 · ce575b1
2 parents 88726d0 + 572d693
commit ce575b1
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/gateway/bsd.rs b/src/gateway/bsd.rs
@@ -411,7 +411,16 @@ fn get_arp_table() -> io::Result<HashMap<IpAddr, MacAddr>> {
         let mut offset = 0;
         while offset < len as usize {
             let rt_hdr = &*(buf.as_ptr().add(offset) as *const rt_msghdr);
-            assert_eq!(rt_hdr.rtm_version as u32, RTM_VERSION);
+            if rt_hdr.rtm_version as u32 != RTM_VERSION {
+                eprintln!(
+                    "Unexpected RTM_VERSION: {} in {:?}",
+                    rt_hdr.rtm_version, rt_hdr
+                );
+                return Err(io::Error::new(
+                    io::ErrorKind::InvalidData,
+                    format!("Unexpected RTM_VERSION: {}", rt_hdr.rtm_version),
+                ));
+            }
 
             let msg_len = rt_hdr.rtm_msglen as usize;
             offset += msg_len;

diff --git a/src/gateway/macos.rs b/src/gateway/macos.rs
@@ -314,12 +314,12 @@ fn list_routes() -> io::Result<Vec<Route>> {
         let rt_hdr = unsafe { std::mem::transmute::<_, &rt_msghdr>(buf.as_ptr()) };
         if rt_hdr.rtm_version as u32 != RTM_VERSION {
             eprintln!(
-                "unexpected RTM_VERSION: {} in {:?}",
+                "Unexpected RTM_VERSION: {} in {:?}",
                 rt_hdr.rtm_version, rt_hdr
             );
             return Err(io::Error::new(
                 io::ErrorKind::InvalidData,
-                format!("unexpected RTM_VERSION: {}", rt_hdr.rtm_version),
+                format!("Unexpected RTM_VERSION: {}", rt_hdr.rtm_version),
             ));
         }
 
@@ -425,7 +425,16 @@ fn get_arp_table() -> io::Result<HashMap<IpAddr, MacAddr>> {
         }
 
         let rt_hdr = unsafe { std::mem::transmute::<_, &rt_msghdr>(buf.as_ptr()) };
-        assert_eq!(rt_hdr.rtm_version as u32, RTM_VERSION);
+        if rt_hdr.rtm_version as u32 != RTM_VERSION {
+            eprintln!(
+                "Unexpected RTM_VERSION: {} in {:?}",
+                rt_hdr.rtm_version, rt_hdr
+            );
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                format!("Unexpected RTM_VERSION: {}", rt_hdr.rtm_version),
+            ));
+        }
         if rt_hdr.rtm_errno != 0 {
             return Err(code_to_error(rt_hdr.rtm_errno));
         }

diff --git a/src/interface/android.rs b/src/interface/android.rs
@@ -200,7 +200,12 @@ pub mod netlink {
             packet.finalize();
 
             let mut buf = vec![0; packet.header.length as usize];
-            assert_eq!(buf.len(), packet.buffer_len());
+            if buf.len() != packet.buffer_len() {
+                return Err(io::Error::new(
+                    io::ErrorKind::Other,
+                    "Buffer length mismatch in netlink packet",
+                ));
+            }
             packet.serialize(&mut buf[..]);
             socket.send(&buf[..], 0)?;