blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ip-echo-server: Limit socket read to expected reply length

This commit is contained in:
Trent Nelson 2020-11-11 19:29:04 -07:00 committed by mergify[bot]
parent 7481ba5618
commit d2cfeb31b9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net-utils/src/lib.rs
View File

@ -32,7 +32,7 @@ fn ip_echo_server_request(
ip_echo_server_addr: &SocketAddr, ip_echo_server_addr: &SocketAddr,
msg: IpEchoServerMessage, msg: IpEchoServerMessage,
) -> Result<IpAddr, String> { ) -> Result<IpAddr, String> {
let mut data = Vec::new(); let mut data = vec![0u8; ip_echo_server_reply_length()];
let timeout = Duration::new(5, 0); let timeout = Duration::new(5, 0);
TcpStream::connect_timeout(ip_echo_server_addr, timeout) TcpStream::connect_timeout(ip_echo_server_addr, timeout)
@ -49,7 +49,7 @@ fn ip_echo_server_request(
stream.set_read_timeout(Some(Duration::new(10, 0)))?; stream.set_read_timeout(Some(Duration::new(10, 0)))?;
stream.write_all(&bytes)?; stream.write_all(&bytes)?;
stream.shutdown(std::net::Shutdown::Write)?; stream.shutdown(std::net::Shutdown::Write)?;
stream.read_to_end(&mut data) stream.read(data.as_mut_slice())
}) })
.and_then(|_| { .and_then(|_| {
// It's common for users to accidentally confuse the validator's gossip port and JSON // It's common for users to accidentally confuse the validator's gossip port and JSON