diff options
author | Ian Gudger <igudger@google.com> | 2018-12-13 13:19:39 -0800 |
---|---|---|
committer | Shentubot <shentubot@google.com> | 2018-12-13 13:20:46 -0800 |
commit | 4659f7ed1a63f031b5450d065684ef6c32d35f01 (patch) | |
tree | cfb15ddd2e80b2a497e3160352155fa6a2060c0f /pkg/sentry/socket/socket.go | |
parent | 6253d32cc932e76608be5c57a4870b3d61464487 (diff) |
Fix WAITALL and RCVTIMEO interaction
PiperOrigin-RevId: 225424296
Change-Id: I60fcc2b859339dca9963cb32227a287e719ab765
Diffstat (limited to 'pkg/sentry/socket/socket.go')
-rw-r--r-- | pkg/sentry/socket/socket.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/sentry/socket/socket.go b/pkg/sentry/socket/socket.go index f31729819..f73127ea6 100644 --- a/pkg/sentry/socket/socket.go +++ b/pkg/sentry/socket/socket.go @@ -86,6 +86,8 @@ type Socket interface { // // senderAddrLen is the address length to be returned to the application, // not necessarily the actual length of the address. + // + // If err != nil, the recv was not successful. RecvMsg(t *kernel.Task, dst usermem.IOSequence, flags int, haveDeadline bool, deadline ktime.Time, senderRequested bool, controlDataLen uint64) (n int, senderAddr interface{}, senderAddrLen uint32, controlMessages ControlMessages, err *syserr.Error) // SendMsg implements the sendmsg(2) linux syscall. SendMsg does not take |