From 7924ef76da81b950d253eb1f8ddbc7665be3b27d Mon Sep 17 00:00:00 2001
From: Tomofumi Hayashi <tohayash@redhat.com>
Date: Thu, 18 Apr 2019 00:54:31 +0900
Subject: [PATCH] Incorporate with reviewer's comments

---
 plugins/main/macvlan/macvlan.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go
index 77127eac..797c1563 100644
--- a/plugins/main/macvlan/macvlan.go
+++ b/plugins/main/macvlan/macvlan.go
@@ -51,20 +51,23 @@ func init() {
 	runtime.LockOSThread()
 }
 
-func getDefaultRouteInterfaceName() string {
+func getDefaultRouteInterfaceName() (string, error) {
 	routeToDstIP, err := netlink.RouteList(nil, netlink.FAMILY_ALL)
 	if err != nil {
-		return ""
+		return "", err
 	}
 
 	for _, v := range routeToDstIP {
-		l, _ := netlink.LinkByIndex(v.LinkIndex)
 		if v.Dst == nil {
-			return l.Attrs().Name
+			l, err := netlink.LinkByIndex(v.LinkIndex)
+			if err != nil {
+				return "", err
+			}
+			return l.Attrs().Name, nil
 		}
 	}
 
-	return ""
+	return "", fmt.Errorf("no default route interface found")
 }
 
 func loadConf(bytes []byte) (*NetConf, string, error) {
@@ -73,9 +76,9 @@ func loadConf(bytes []byte) (*NetConf, string, error) {
 		return nil, "", fmt.Errorf("failed to load netconf: %v", err)
 	}
 	if n.Master == "" {
-		defaultRouteInterface := getDefaultRouteInterfaceName()
-		if defaultRouteInterface == "" {
-			return nil, "", fmt.Errorf(`cannot get default route interface for master`)
+		defaultRouteInterface, err := getDefaultRouteInterfaceName()
+		if err != nil {
+			return nil, "", err
 		}
 		n.Master = defaultRouteInterface
 	}