From afba48aeba7659c8420b77495287bb0d5d2391c7 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Tue, 14 Jan 2020 18:49:46 +0300
Subject: [PATCH] fixed panic on empty remote read request (#4619)
---
substrate/client/network/src/protocol.rs | 14 ++++++++++++++
substrate/client/rpc/src/state/state_light.rs | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/substrate/client/network/src/protocol.rs b/substrate/client/network/src/protocol.rs
index b712ebe5155..2aa29ea2793 100644
--- a/substrate/client/network/src/protocol.rs
+++ b/substrate/client/network/src/protocol.rs
@@ -1472,6 +1472,13 @@ impl<B: BlockT, S: NetworkSpecialization<B>, H: ExHashT> Protocol<B, S, H> {
who: PeerId,
request: message::RemoteReadRequest<B::Hash>,
) {
+ if request.keys.is_empty() {
+ debug!(target: "sync", "Invalid remote read request sent by {}", who);
+ self.behaviour.disconnect_peer(&who);
+ self.peerset_handle.report_peer(who, rep::BAD_MESSAGE);
+ return;
+ }
+
let keys_str = || match request.keys.len() {
1 => request.keys[0].to_hex::<String>(),
_ => format!(
@@ -1510,6 +1517,13 @@ impl<B: BlockT, S: NetworkSpecialization<B>, H: ExHashT> Protocol<B, S, H> {
who: PeerId,
request: message::RemoteReadChildRequest<B::Hash>,
) {
+ if request.keys.is_empty() {
+ debug!(target: "sync", "Invalid remote child read request sent by {}", who);
+ self.behaviour.disconnect_peer(&who);
+ self.peerset_handle.report_peer(who, rep::BAD_MESSAGE);
+ return;
+ }
+
let keys_str = || match request.keys.len() {
1 => request.keys[0].to_hex::<String>(),
_ => format!(
diff --git a/substrate/client/rpc/src/state/state_light.rs b/substrate/client/rpc/src/state/state_light.rs
index abf4631bb82..482eb0723ff 100644
--- a/substrate/client/rpc/src/state/state_light.rs
+++ b/substrate/client/rpc/src/state/state_light.rs
@@ -325,8 +325,8 @@ impl<Block, F, B, E, RA> StateBackend<B, E, Block, RA> for LightState<Block, F,
keys: Option<Vec<StorageKey>>
) {
let keys = match keys {
- Some(keys) => keys,
- None => {
+ Some(keys) if !keys.is_empty() => keys,
+ _ => {
warn!("Cannot subscribe to all keys on light client. Subscription rejected.");
return;
}
--
GitLab