diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-12-10 00:26:19 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-10 00:26:19 +0000 |
| commit | 23f464469bb7ccd79928a7a749219336b7bcb2c0 (patch) | |
| tree | e2e9e61f29e18cadb71aa78302865d807733f95a /pkg/sentry/socket/hostinet | |
| parent | 1faf5799ed1fb83a36c6433b22a7c8f495395943 (diff) | |
| parent | 92ca72ecb73d91e9def31e7f9835adf7a50b3d65 (diff) | |
Merge release-20201130.0-74-g92ca72ecb (automated)
Diffstat (limited to 'pkg/sentry/socket/hostinet')
| -rw-r--r-- | pkg/sentry/socket/hostinet/socket.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/hostinet/socket.go b/pkg/sentry/socket/hostinet/socket.go index 7d3c4a01c..a35850a8f 100644 --- a/pkg/sentry/socket/hostinet/socket.go +++ b/pkg/sentry/socket/hostinet/socket.go @@ -551,7 +551,7 @@ func (s *socketOpsCommon) SendMsg(t *kernel.Task, src usermem.IOSequence, to []b } controlBuf := make([]byte, 0, space) // PackControlMessages will append up to space bytes to controlBuf. - controlBuf = control.PackControlMessages(t, controlMessages, controlBuf) + controlBuf = control.PackControlMessages(t, s.family, controlMessages, controlBuf) sendmsgFromBlocks := safemem.WriterFunc(func(srcs safemem.BlockSeq) (uint64, error) { // Refuse to do anything if any part of src.Addrs was unusable. |