github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 12:44:39 +00:00
Code Issues Projects Releases Wiki Activity

runtime/network: Fix error reporting in listRoutes()

Browse Source 
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.

fixes #1206

Forward port of
0ffaeeb5d8

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2020-10-29 14:38:50 +11:00
parent 1ae8e81abb
commit e004616b02
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/virtcontainers/kata_agent.go
View File

@ -648,10 +648,10 @@ func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) {
return nil, err return nil, err
} }
resultRoutes, ok := resultingRoutes.(*grpc.Routes) resultRoutes, ok := resultingRoutes.(*grpc.Routes)
if ok { if !ok {
return resultRoutes.Routes, err return nil, fmt.Errorf("Unexpected type %T for routes", resultingRoutes)
} }
return nil, err return resultRoutes.Routes, nil
} }
func (k *kataAgent) getAgentURL() (string, error) { func (k *kataAgent) getAgentURL() (string, error) {