From aca7b01c6b0a2b0e266e67b91a0de9d2cb48a644 Mon Sep 17 00:00:00 2001
From: Demi Marie Obenour <demiobenour@gmail.com>
Date: Sun, 7 Dec 2025 16:27:09 -0500
Subject: [PATCH] net_util: Fix MAC address parsing

It wrongly allowed addresses containing a + instead of a hex character.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
---
 net_util/src/mac.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/net_util/src/mac.rs b/net_util/src/mac.rs
index dec802788..d9501a1d9 100644
--- a/net_util/src/mac.rs
+++ b/net_util/src/mac.rs
@@ -39,13 +39,10 @@ impl MacAddr {
             if v[i].len() != 2 {
                 return common_err;
             }
-            bytes[i] = u8::from_str_radix(v[i], 16).map_err(|e| {
-                io::Error::other(format!(
-                    "parsing of {} into a MAC address failed: {}",
-                    s.as_ref(),
-                    e
-                ))
-            })?;
+            if !v[i].bytes().all(|a| a.is_ascii_hexdigit()) {
+                return common_err;
+            }
+            bytes[i] = u8::from_str_radix(v[i], 16).unwrap();
         }
 
         Ok(MacAddr { bytes })
@@ -187,6 +184,8 @@ mod unit_tests {
         let bytes = mac.get_bytes();
         assert_eq!(bytes, [0x12u8, 0x34, 0x56, 0x78, 0x9a, 0xbc]);
 
+        MacAddr::parse_str("12:34:56:78:9a:+c").unwrap_err();
+
         let s = serde_json::to_string(&mac).expect("MacAddr serialization failed.");
         assert_eq!(s, "\"12:34:56:78:9a:bc\"");
     }