From 0ffaeeb5d84054cf2726e5fbdfbfde54c75ec6d7 Mon Sep 17 00:00:00 2001
From: David Gibson <david@gibson.dropbear.id.au>
Date: Thu, 29 Oct 2020 14:38:50 +1100
Subject: [PATCH] network: Fix error reporting in listRoutes()

If the upcast from resultingRoutes to *grpc.IRoutes fails, we return
(nil, err), but previous code ensures that err is nil at that point, so we
return no error.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 virtcontainers/kata_agent.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
index 49cd9149e3..43d18c23a4 100644
--- a/virtcontainers/kata_agent.go
+++ b/virtcontainers/kata_agent.go
@@ -685,10 +685,10 @@ func (k *kataAgent) listRoutes() ([]*vcTypes.Route, error) {
 		return nil, err
 	}
 	resultRoutes, ok := resultingRoutes.(*grpc.Routes)
-	if ok {
-		return k.convertToRoutes(resultRoutes.Routes), err
+	if !ok {
+		return nil, fmt.Errorf("Unexpected type %T for routes", resultingRoutes)
 	}
-	return nil, err
+	return k.convertToRoutes(resultRoutes.Routes), nil
 }
 
 func (k *kataAgent) startProxy(sandbox *Sandbox) error {