Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-01 17:01:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix IPV6 address deserialization (#1932)

Browse source 
Fuzz test found that we don't read IPV6 addr (as part of p2p message)
properly. The code is supposed to read 8 dwords, but [0..8] is not a
slice of 8 ints, but a slice of one Range, so we always read just one
dword
This commit is contained in:
hashmap 2018-11-06 05:38:41 +01:00 committed by Ignotus Peverell
parent 109a426990
commit 0af1f13bf9
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/macros.rs
View file

@ -29,7 +29,15 @@ macro_rules! map_vec {
#[macro_export] #[macro_export]
macro_rules! try_map_vec { macro_rules! try_map_vec {
($thing:expr, $mapfn:expr) => { ($thing:expr, $mapfn:expr) => {
$thing.iter().map($mapfn).collect::<Result<Vec<_>, _>>()?; try_iter_map_vec!($thing.iter(), $mapfn);
};
}
/// Same as try_map_vec when thing is an iterator
#[macro_export]
macro_rules! try_iter_map_vec {
($thing:expr, $mapfn:expr) => {
$thing.map($mapfn).collect::<Result<Vec<_>, _>>()?;
}; };
} }

2
p2p/src/msg.rs
View file

@ -551,7 +551,7 @@ impl Readable for SockAddr {
port, port,
)))) ))))
} else { } else {
let ip = try_map_vec!([0..8], |_| reader.read_u16()); let ip = try_iter_map_vec!(0..8, |_| reader.read_u16());
let port = reader.read_u16()?; let port = reader.read_u16()?;
Ok(SockAddr(SocketAddr::V6(SocketAddrV6::new( Ok(SockAddr(SocketAddr::V6(SocketAddrV6::new(
Ipv6Addr::new(ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7]), Ipv6Addr::new(ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7]),