summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket/socket.go
diff options
context:
space:
mode:
authorDean Deng <deandeng@google.com>2020-04-04 21:01:42 -0700
committergVisor bot <gvisor-bot@google.com>2020-04-04 21:02:42 -0700
commit24bee1c1813a691072cff5bad7a528690a99eb5e (patch)
treefdec3e4bcc1418da069340c4f7d2cd5649f3c4e4 /pkg/sentry/socket/socket.go
parentfc99a7ebf0c24b6f7b3cfd6351436373ed54548b (diff)
Record VFS2 sockets in global socket map.
Updates #1476, #1478, #1484, #1485. PiperOrigin-RevId: 304845354
Diffstat (limited to 'pkg/sentry/socket/socket.go')
-rw-r--r--pkg/sentry/socket/socket.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/socket/socket.go b/pkg/sentry/socket/socket.go
index b5ba4a56b..6580bd6e9 100644
--- a/pkg/sentry/socket/socket.go
+++ b/pkg/sentry/socket/socket.go
@@ -269,7 +269,7 @@ func NewVFS2(t *kernel.Task, family int, stype linux.SockType, protocol int) (*v
return nil, err
}
if s != nil {
- // TODO: Add vfs2 sockets to global socket table.
+ t.Kernel().RecordSocketVFS2(s)
return s, nil
}
}
@@ -291,7 +291,9 @@ func PairVFS2(t *kernel.Task, family int, stype linux.SockType, protocol int) (*
return nil, nil, err
}
if s1 != nil && s2 != nil {
- // TODO: Add vfs2 sockets to global socket table.
+ k := t.Kernel()
+ k.RecordSocketVFS2(s1)
+ k.RecordSocketVFS2(s2)
return s1, s2, nil
}
}