netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

rpcinet is treating EAGAIN and EWOULDBLOCK as different errnos.

Browse Source 
PiperOrigin-RevId: 200124614
Change-Id: I38a7b083f1464a2a586fe24db648e624c455fec5
This commit is contained in:
Brian Geffon
2018-06-11 15:34:08 -07:00
committed by Shentubot
parent 7260363751
commit 0412f17e06
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/socket/rpcinet/socket.go
+6 -6
View File
@@ -228,7 +228,7 @@ func (s *socketOperations) Accept(t *kernel.Task, peerRequested bool, flags int,
payload, se := rpcAccept(t, s.fd, peerRequested)
// Check if we need to block.
if blocking && se == syserr.ErrWouldBlock {
if blocking && se == syserr.ErrTryAgain {
// Register for notifications.
e, ch := waiter.NewChannelEntry(nil)
s.EventRegister(&e, waiter.EventIn)
@@ -237,7 +237,7 @@ func (s *socketOperations) Accept(t *kernel.Task, peerRequested bool, flags int,
// Try to accept the connection again; if it fails, then wait until we
// get a notification.
for {
if payload, se = rpcAccept(t, s.fd, peerRequested); se != syserr.ErrWouldBlock {
if payload, se = rpcAccept(t, s.fd, peerRequested); se != syserr.ErrTryAgain {
break
}
@@ -471,7 +471,7 @@ func (s *socketOperations) RecvMsg(t *kernel.Task, dst usermem.IOSequence, flags
}
return int(res.Length), res.Address.GetAddress(), res.Address.GetLength(), socket.ControlMessages{}, syserr.FromError(e)
}
if err != syserr.ErrWouldBlock || flags&linux.MSG_DONTWAIT != 0 {
if err != syserr.ErrWouldBlock && err != syserr.ErrTryAgain || flags&linux.MSG_DONTWAIT != 0 {
return 0, nil, 0, socket.ControlMessages{}, err
}
@@ -490,7 +490,7 @@ func (s *socketOperations) RecvMsg(t *kernel.Task, dst usermem.IOSequence, flags
}
return int(res.Length), res.Address.GetAddress(), res.Address.GetLength(), socket.ControlMessages{}, syserr.FromError(e)
}
if err != syserr.ErrWouldBlock {
if err != syserr.ErrWouldBlock && err != syserr.ErrTryAgain {
return 0, nil, 0, socket.ControlMessages{}, err
}
@@ -546,7 +546,7 @@ func (s *socketOperations) SendMsg(t *kernel.Task, src usermem.IOSequence, to []
}}
n, err := rpcSendMsg(t, req)
if err != syserr.ErrWouldBlock || flags&linux.MSG_DONTWAIT != 0 {
if err != syserr.ErrWouldBlock && err != syserr.ErrTryAgain || flags&linux.MSG_DONTWAIT != 0 {
return int(n), err
}
@@ -558,7 +558,7 @@ func (s *socketOperations) SendMsg(t *kernel.Task, src usermem.IOSequence, to []
for {
n, err := rpcSendMsg(t, req)
if err != syserr.ErrWouldBlock {
if err != syserr.ErrWouldBlock && err != syserr.ErrTryAgain {
return int(n), err
}