ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Fix overwritten error var in getMTUByName

Browse Source 
this prevents the error to be lost which was causing the
panic while accesing a nil var.

Fix #830

Signed-off-by: Marcelo Guerrero Viveros <marguerr@redhat.com>
This commit is contained in:
Marcelo Guerrero Viveros 2023-02-16 12:11:41 +01:00
parent fb92605570
commit 9ee4d3225d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/main/macvlan/macvlan.go
View File

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

3
plugins/main/vlan/vlan.go
View File

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