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 issues found by fuzz test (#1330)

Browse source 
Fuzz test found the folowing issues with reading block header:
* Unbounded cuckou_sizeshift field in Proof
* Different timestamp range after migration to chrono crate
This commit is contained in:
hashmap 2018-08-10 01:35:46 +02:00 committed by Ignotus Peverell
parent f11a3b1994
commit ae3b1da18b
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/core/block.rs
View file

@ -18,6 +18,7 @@ use rand::{thread_rng, Rng};
use std::collections::HashSet; use std::collections::HashSet;
use std::fmt; use std::fmt;
use std::iter::FromIterator; use std::iter::FromIterator;
use chrono::naive::{MAX_DATE, MIN_DATE};
use chrono::prelude::{DateTime, NaiveDateTime, Utc}; use chrono::prelude::{DateTime, NaiveDateTime, Utc};
use consensus::{self, exceeds_weight, reward, VerifySortOrder, REWARD}; use consensus::{self, exceeds_weight, reward, VerifySortOrder, REWARD};
@ -190,7 +191,7 @@ impl Readable for BlockHeader {
ser_multiread!(reader, read_u64, read_u64, read_u64); ser_multiread!(reader, read_u64, read_u64, read_u64);
let pow = Proof::read(reader)?; let pow = Proof::read(reader)?;
if timestamp > (1 << 55) || timestamp < -(1 << 55) { if timestamp > MAX_DATE.and_hms(0,0,0).timestamp() || timestamp <MIN_DATE.and_hms(0,0,0).timestamp(){
return Err(ser::Error::CorruptedData); return Err(ser::Error::CorruptedData);
} }

3
core/src/core/mod.rs
View file

@ -123,6 +123,9 @@ impl Proof {
impl Readable for Proof { impl Readable for Proof {
fn read(reader: &mut Reader) -> Result<Proof, Error> { fn read(reader: &mut Reader) -> Result<Proof, Error> {
let cuckoo_sizeshift = reader.read_u8()?; let cuckoo_sizeshift = reader.read_u8()?;
if cuckoo_sizeshift == 0 || cuckoo_sizeshift > 64 {
return Err(Error::CorruptedData);
}
let mut nonces = Vec::with_capacity(global::proofsize()); let mut nonces = Vec::with_capacity(global::proofsize());
let nonce_bits = cuckoo_sizeshift as usize - 1; let nonce_bits = cuckoo_sizeshift as usize - 1;