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 <[email protected]>
kata-containers · Oct 29, 2020 · 0ffaeeb · 0ffaeeb
1 parent b86e904
commit 0ffaeeb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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 {