From 12d9790833cc2f6a9b197066a5ecbeb434f74164 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@google.com>
Date: Fri, 15 Jan 2021 15:47:13 -0800
Subject: Remove count argument from tcpip.Endpoint.Read
The same intent can be specified via the io.Writer.
PiperOrigin-RevId: 352098747
---
pkg/sentry/socket/netstack/netstack.go | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
(limited to 'pkg/sentry/socket/netstack')
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go
index 03749a8bf..22e128b96 100644
--- a/pkg/sentry/socket/netstack/netstack.go
+++ b/pkg/sentry/socket/netstack/netstack.go
@@ -425,8 +425,13 @@ func (s *SocketOperations) WriteTo(ctx context.Context, _ *fs.File, dst io.Write
s.readMu.Lock()
defer s.readMu.Unlock()
+ w := tcpip.LimitedWriter{
+ W: dst,
+ N: count,
+ }
+
// This may return a blocking error.
- res, err := s.Endpoint.Read(dst, int(count), tcpip.ReadOptions{
+ res, err := s.Endpoint.Read(&w, tcpip.ReadOptions{
Peek: dup,
})
if err != nil {
@@ -2579,7 +2584,10 @@ func (s *socketOpsCommon) nonBlockingRead(ctx context.Context, dst usermem.IOSeq
// caller-supplied buffer.
var w io.Writer
if !isPacket && trunc {
- w = ioutil.Discard
+ w = &tcpip.LimitedWriter{
+ W: ioutil.Discard,
+ N: dst.NumBytes(),
+ }
} else {
w = dst.Writer(ctx)
}
@@ -2587,7 +2595,10 @@ func (s *socketOpsCommon) nonBlockingRead(ctx context.Context, dst usermem.IOSeq
s.readMu.Lock()
defer s.readMu.Unlock()
- res, err := s.Endpoint.Read(w, int(dst.NumBytes()), readOptions)
+ res, err := s.Endpoint.Read(w, readOptions)
+ if err == tcpip.ErrBadBuffer && dst.NumBytes() == 0 {
+ err = nil
+ }
if err != nil {
return 0, 0, nil, 0, socket.ControlMessages{}, syserr.TranslateNetstackError(err)
}
--
cgit v1.2.3