From: Matt Corallo <git@bluematt.me>
Date: Thu, 2 Jan 2020 02:13:48 +0000 (-0500)
Subject: Refuse to deserialize OnionHopDatas with values > 21 million
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9b5226d48323957203bf0dfbf8253825c7957cfc;p=rust-lightning

Refuse to deserialize OnionHopDatas with values > 21 million

We should probably do this for all values (and define a newtype
for msat values), but this will do for now.
---

diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
index b20e5d5bc..cd93e236a 100644
--- a/lightning/src/ln/msgs.rs
+++ b/lightning/src/ln/msgs.rs
@@ -33,6 +33,9 @@ use util::ser::{Readable, Writeable, Writer, FixedLengthReader, HighZeroBytesDro
 
 use ln::channelmanager::{PaymentPreimage, PaymentHash};
 
+/// 21 million * 10^8 * 1000
+pub(crate) const MAX_VALUE_MSAT: u64 = 21_000_000_0000_0000_000;
+
 /// An error in decoding a message or struct.
 #[derive(Debug)]
 pub enum DecodeError {
@@ -1095,6 +1098,11 @@ impl<R: Read> Readable<R> for OnionHopData {
 					short_channel_id,
 				}
 			} else {
+				if let &Some(ref data) = &payment_data {
+					if data.total_msat > MAX_VALUE_MSAT {
+						return Err(DecodeError::InvalidValue);
+					}
+				}
 				OnionHopDataFormat::FinalNode {
 					payment_data
 				}
@@ -1106,6 +1114,9 @@ impl<R: Read> Readable<R> for OnionHopData {
 			};
 			let amt: u64 = Readable::read(r)?;
 			let cltv_value: u32 = Readable::read(r)?;
+			if amt > MAX_VALUE_MSAT {
+				return Err(DecodeError::InvalidValue);
+			}
 			r.read_exact(&mut [0; 12])?;
 			(format, amt, cltv_value)
 		};