github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 09:54:33 +00:00
Code Issues Projects Releases Wiki Activity

runtime/network: Correct error reporting in listInterfaces()

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

Forward port of
b86e904c2d

fixes #1206

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson
2020-10-29 14:34:52 +11:00
committed by Peng Tao
parent 0fd70f7ec3
commit fce14f3697
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -635,10 +635,10 @@ func (k *kataAgent) listInterfaces() ([]*pbTypes.Interface, error) {
return nil, err return nil, err
} }
resultInterfaces, ok := resultingInterfaces.(*grpc.Interfaces) resultInterfaces, ok := resultingInterfaces.(*grpc.Interfaces)
if ok { if !ok {
return resultInterfaces.Interfaces, err return nil, fmt.Errorf("Unexpected type %T for interfaces", resultingInterfaces)
} }
return nil, err return resultInterfaces.Interfaces, nil
} }
func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) { func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) {