diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-08-02 23:43:40 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-08-02 23:43:40 +0000 |
commit | 6093b41e8aa508d6d5019bca7d2415dfb8653254 (patch) | |
tree | ac60dd02b34623546c19e51ddfa067d40fc3f35c /pkg/sentry/socket/rpcinet | |
parent | 7ddd7ef41709212d846dd6da1f8f718397ce36a1 (diff) | |
parent | 960a5e5536d5d961028ef60123e3b00ff3c04a56 (diff) |
Merge 960a5e55 (automated)
Diffstat (limited to 'pkg/sentry/socket/rpcinet')
-rw-r--r-- | pkg/sentry/socket/rpcinet/socket.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/rpcinet/socket.go b/pkg/sentry/socket/rpcinet/socket.go index ccaaddbfc..0e58819bc 100644 --- a/pkg/sentry/socket/rpcinet/socket.go +++ b/pkg/sentry/socket/rpcinet/socket.go @@ -395,7 +395,7 @@ func (s *socketOperations) Shutdown(t *kernel.Task, how int) *syserr.Error { } // GetSockOpt implements socket.Socket.GetSockOpt. -func (s *socketOperations) GetSockOpt(t *kernel.Task, level int, name int, outLen int) (interface{}, *syserr.Error) { +func (s *socketOperations) GetSockOpt(t *kernel.Task, level int, name int, outPtr usermem.Addr, outLen int) (interface{}, *syserr.Error) { // SO_RCVTIMEO and SO_SNDTIMEO are special because blocking is performed // within the sentry. if level == linux.SOL_SOCKET && name == linux.SO_RCVTIMEO { |