fix: handle linkstate decoding error (#1743)

Panicking here was causing a major security breach concerning every non-encrypted transport, especially UDP ones. An attacker could simply forge a invalid OAM linkstate message to make the transport panic. Regarding UDP multicast network, a single message could make the whole network instantly unresponsive.
eclipse-zenoh · Jan 29, 2025 · 1b918b1 · 1b918b1
1 parent eb3a7a4
commit 1b918b1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/zenoh/src/net/routing/hat/linkstate_peer/mod.rs b/zenoh/src/net/routing/hat/linkstate_peer/mod.rs
@@ -392,7 +392,9 @@ impl HatBaseTrait for HatCode {
                     use zenoh_codec::RCodec;
                     let codec = Zenoh080Routing::new();
                     let mut reader = buf.reader();
-                    let list: LinkStateList = codec.read(&mut reader).unwrap();
+                    let Ok(list): Result<LinkStateList, _> = codec.read(&mut reader) else {
+                        bail!("failed to decode link state");
+                    };
 
                     let whatami = transport.get_whatami()?;
                     if whatami != WhatAmI::Client {

diff --git a/zenoh/src/net/routing/hat/p2p_peer/mod.rs b/zenoh/src/net/routing/hat/p2p_peer/mod.rs
@@ -337,7 +337,9 @@ impl HatBaseTrait for HatCode {
                             use zenoh_codec::RCodec;
                             let codec = Zenoh080Routing::new();
                             let mut reader = buf.reader();
-                            let list: LinkStateList = codec.read(&mut reader).unwrap();
+                            let Ok(list): Result<LinkStateList, _> = codec.read(&mut reader) else {
+                                bail!("failed to decode link state");
+                            };
 
                             net.link_states(list.link_states, zid, whatami);
                         }

diff --git a/zenoh/src/net/routing/hat/router/mod.rs b/zenoh/src/net/routing/hat/router/mod.rs
@@ -625,7 +625,9 @@ impl HatBaseTrait for HatCode {
                     use zenoh_codec::RCodec;
                     let codec = Zenoh080Routing::new();
                     let mut reader = buf.reader();
-                    let list: LinkStateList = codec.read(&mut reader).unwrap();
+                    let Ok(list): Result<LinkStateList, _> = codec.read(&mut reader) else {
+                        bail!("failed to decode link state");
+                    };
 
                     let whatami = transport.get_whatami()?;
                     match whatami {