Skip to content

Commit ebddf4f

Browse files
mlguerrero12maiqueb
authored andcommitted
Fix overwritten error var in getMTUByName
this prevents the error to be lost which was causing the panic while accesing a nil var. Fix containernetworking#830 Signed-off-by: Marcelo Guerrero Viveros <[email protected]>
1 parent 239bdb6 commit ebddf4f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

plugins/main/macvlan/macvlan.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ func getMTUByName(ifName string, namespace string, inContainer bool) (int, error
148148
var link netlink.Link
149149
var err error
150150
if inContainer {
151-
netns, err := ns.GetNS(namespace)
151+
var netns ns.NetNS
152+
netns, err = ns.GetNS(namespace)
152153
if err != nil {
153154
return 0, fmt.Errorf("failed to open netns %q: %v", netns, err)
154155
}

plugins/main/vlan/vlan.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ func getMTUByName(ifName string, namespace string, inContainer bool) (int, error
7575
var link netlink.Link
7676
var err error
7777
if inContainer {
78-
netns, err := ns.GetNS(namespace)
78+
var netns ns.NetNS
79+
netns, err = ns.GetNS(namespace)
7980
if err != nil {
8081
return 0, fmt.Errorf("failed to open netns %q: %v", netns, err)
8182
}

0 commit comments

Comments
 (0)