From: Matt Corallo <git@bluematt.me>
Date: Mon, 10 Dec 2018 20:02:50 +0000 (-0500)
Subject: Check tx output matches monitor output data (and is sufficient len)
X-Git-Tag: v0.0.12~259^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=refs%2Fheads%2F2015-12-fuzz-fix-output-idx;p=rust-lightning

Check tx output matches monitor output data (and is sufficient len)

Fixes a panic found by fuzzer in case the monitor per-commitment
data is garbage. We had a similar check for revoked commitment tx
but didn't copy it down to non-revoked commitment tx, so do that
now.
---

diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs
index 7faeae68..79900e32 100644
--- a/src/ln/channelmonitor.rs
+++ b/src/ln/channelmonitor.rs
@@ -1157,6 +1157,12 @@ impl ChannelMonitor {
 					}
 
 					for (idx, htlc) in per_commitment_data.iter().enumerate() {
+						let expected_script = chan_utils::get_htlc_redeemscript_with_explicit_keys(&htlc, &a_htlc_key, &b_htlc_key, &revocation_pubkey);
+						if htlc.transaction_output_index as usize >= tx.output.len() ||
+								tx.output[htlc.transaction_output_index as usize].value != htlc.amount_msat / 1000 ||
+								tx.output[htlc.transaction_output_index as usize].script_pubkey != expected_script.to_v0_p2wsh() {
+							return (txn_to_broadcast, (commitment_txid, watch_outputs), spendable_outputs); // Corrupted per_commitment_data, fuck this user
+						}
 						if let Some(payment_preimage) = self.payment_preimages.get(&htlc.payment_hash) {
 							let input = TxIn {
 								previous_output: BitcoinOutPoint {