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

Remove some unchecked math from the quic chunk handling (#26408)

This commit is contained in:
sakridge 2022-07-16 17:03:31 +02:00 committed by GitHub
parent 22d465cd57
commit 9714cb3764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
streamer/src/nonblocking/quic.rs
View File

@ -416,7 +416,11 @@ fn handle_chunk(
stats.total_invalid_chunks.fetch_add(1, Ordering::Relaxed); stats.total_invalid_chunks.fetch_add(1, Ordering::Relaxed);
return true; return true;
} }
if chunk.offset + chunk_len > PACKET_DATA_SIZE as u64 { let end_of_chunk = match chunk.offset.checked_add(chunk_len) {
Some(end) => end,
None => return true,
};
if end_of_chunk > PACKET_DATA_SIZE as u64 {
stats stats
.total_invalid_chunk_size .total_invalid_chunk_size
.fetch_add(1, Ordering::Relaxed); .fetch_add(1, Ordering::Relaxed);
@ -437,9 +441,14 @@ fn handle_chunk(
} }
if let Some(batch) = maybe_batch.as_mut() { if let Some(batch) = maybe_batch.as_mut() {
let end = chunk.offset as usize + chunk.bytes.len(); let end_of_chunk = match (chunk.offset as usize).checked_add(chunk.bytes.len())
batch[0].buffer_mut()[chunk.offset as usize..end].copy_from_slice(&chunk.bytes); {
batch[0].meta.size = std::cmp::max(batch[0].meta.size, end); Some(end) => end,
None => return true,
};
batch[0].buffer_mut()[chunk.offset as usize..end_of_chunk]
.copy_from_slice(&chunk.bytes);
batch[0].meta.size = std::cmp::max(batch[0].meta.size, end_of_chunk);
stats.total_chunks_received.fetch_add(1, Ordering::Relaxed); stats.total_chunks_received.fetch_add(1, Ordering::Relaxed);
} }
} else { } else {