vsock: Propogate error for vsock ioctl

Make error handling better by propogating error. Fixes #1953 Signed-off-by: Archana Shinde <[email protected]>
kata-containers · Aug 12, 2019 · 3fc17e9 · 3fc17e9
1 parent 4cf1fa6
commit 3fc17e9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/virtcontainers/utils/utils_linux.go b/virtcontainers/utils/utils_linux.go
@@ -73,18 +73,18 @@ func FindContextID() (*os.File, uint64, error) {
 
 	// Looking for the first available context ID.
 	for cid := contextID; cid <= maxUInt; cid++ {
-		if err := ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uintptr(unsafe.Pointer(&cid))); err == nil {
+		if err = ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uintptr(unsafe.Pointer(&cid))); err == nil {
 			return vsockFd, cid, nil
 		}
 	}
 
 	// Last chance to get a free context ID.
 	for cid := contextID - 1; cid >= firstContextID; cid-- {
-		if err := ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uintptr(unsafe.Pointer(&cid))); err == nil {
+		if err = ioctlFunc(vsockFd.Fd(), ioctlVhostVsockSetGuestCid, uintptr(unsafe.Pointer(&cid))); err == nil {
 			return vsockFd, cid, nil
 		}
 	}
 
 	vsockFd.Close()
-	return nil, 0, fmt.Errorf("Could not get a unique context ID for the vsock")
+	return nil, 0, fmt.Errorf("Could not get a unique context ID for the vsock : %s", err)
 }