itsscb/smoltcp
1
0
Fork 0
mirror of https://github.com/smoltcp-rs/smoltcp.git synced 2025-10-02 23:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increase required size for ICMPv4 packets

Browse Source 
- Increase the size required in Icmpv4Packet::check_len to 8 bytes
 - Add a test
This commit is contained in:
Dan Robertson 2018-01-18 01:32:00 +00:00 committed by whitequark
parent 3b824ca642
commit 3ff7e07941
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wire/icmpv4.rs
View File

@ -208,16 +208,12 @@ impl<T: AsRef<[u8]>> Packet<T> {
/// [set_header_len]: #method.set_header_len
pub fn check_len(&self) -> Result<()> {
let len = self.buffer.as_ref().len();
if len < field::CHECKSUM.end {
Err(Error::Truncated)
} else {
if len < self.header_len() as usize {
if len < self.header_len() {
Err(Error::Truncated)
} else {
Ok(())
}
}
}
/// Consume the packet, returning the underlying buffer.
pub fn into_inner(self) -> T {
@ -272,7 +268,7 @@ impl<T: AsRef<[u8]>> Packet<T> {
Message::EchoRequest => field::ECHO_SEQNO.end,
Message::EchoReply => field::ECHO_SEQNO.end,
Message::DstUnreachable => field::UNUSED.end,
_ => field::CHECKSUM.end // make a conservative assumption
_ => field::UNUSED.end // make a conservative assumption
}
}
@ -607,4 +603,12 @@ mod test {
repr.emit(&mut packet, &ChecksumCapabilities::default());
assert_eq!(&packet.into_inner()[..], &ECHO_PACKET_BYTES[..]);
}
#[test]
fn test_check_len() {
let bytes = [0x0b, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00];
assert_eq!(Packet::new_checked(&bytes[..4]), Err(Error::Truncated));
assert!(Packet::new_checked(&bytes[..]).is_ok());
}
}