Fix overwritten error var in getMTUByName

this prevents the error to be lost which was causing the panic while accesing a nil var. Fix #830
containernetworking · Feb 16, 2023 · 02adbbb · 02adbbb
1 parent fb92605
commit 02adbbb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go
@@ -148,7 +148,8 @@ func getMTUByName(ifName string, namespace string, inContainer bool) (int, error
 	var link netlink.Link
 	var err error
 	if inContainer {
-		netns, err := ns.GetNS(namespace)
+		var netns ns.NetNS
+		netns, err = ns.GetNS(namespace)
 		if err != nil {
 			return 0, fmt.Errorf("failed to open netns %q: %v", netns, err)
 		}

diff --git a/plugins/main/vlan/vlan.go b/plugins/main/vlan/vlan.go
@@ -75,7 +75,8 @@ func getMTUByName(ifName string, namespace string, inContainer bool) (int, error
 	var link netlink.Link
 	var err error
 	if inContainer {
-		netns, err := ns.GetNS(namespace)
+		var netns ns.NetNS
+		netns, err = ns.GetNS(namespace)
 		if err != nil {
 			return 0, fmt.Errorf("failed to open netns %q: %v", netns, err)
 		}