Merge pull request bpfman#849 from Billy99/billy99-panic-unwrap

bpfman: Fix panic if XDP prog already loaded
Billy99 · Nov 29, 2023 · d556f26 · d556f26
2 parents 217087d + 472a9c8
commit d556f26
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 642 deletions.
diff --git a/bpfman/src/multiprog/xdp.rs b/bpfman/src/multiprog/xdp.rs
@@ -157,11 +157,19 @@ impl XdpDispatcher {
                 .unwrap();
         } else {
             let flags = self.mode.as_flags();
-            let link = dispatcher.attach(&iface, flags).unwrap();
+            let link = dispatcher.attach(&iface, flags).map_err(|e| {
+                BpfmanError::Error(format!(
+                    "dispatcher attach failed on interface {iface}: {e}"
+                ))
+            })?;
             let owned_link = dispatcher.take_link(link)?;
             let path = format!("{RTDIR_FS_XDP}/dispatcher_{if_index}_link");
             let _ = TryInto::<FdLink>::try_into(owned_link)
-                .unwrap() // TODO: Don't unwrap, although due to minimum kernel version this shouldn't ever panic
+                .map_err(|e| {
+                    BpfmanError::Error(format!(
+                        "FdLink conversion failed on interface {iface}: {e}"
+                    ))
+                })?
                 .pin(path)
                 .map_err(BpfmanError::UnableToPinLink)?;
         }