diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-21 13:16:25 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-21 13:16:25 -0800 |
| commit | 62357a0afb5f4128a11dc9a1dfadd2957ec39e2d (patch) | |
| tree | 2f93dc1bb5680434f3bcd69df60d45af89777a94 /pkg/sentry/fs/proc/net.go | |
| parent | bd292894097ffdf316bc78d81aebd0a2988124f3 (diff) | |
| parent | 2ba6198851dc1e293295d7cadf8c0ae456b68beb (diff) | |
Merge branch 'master' into iptables-write-filter-proto
Diffstat (limited to 'pkg/sentry/fs/proc/net.go')
| -rw-r--r-- | pkg/sentry/fs/proc/net.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/sentry/fs/proc/net.go b/pkg/sentry/fs/proc/net.go index 402919924..3f17e98ea 100644 --- a/pkg/sentry/fs/proc/net.go +++ b/pkg/sentry/fs/proc/net.go @@ -38,6 +38,8 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/header" ) +// LINT.IfChange + // newNet creates a new proc net entry. func (p *proc) newNetDir(ctx context.Context, k *kernel.Kernel, msrc *fs.MountSource) *fs.Inode { var contents map[string]*fs.Inode @@ -831,3 +833,5 @@ func (n *netUDP) ReadSeqFileData(ctx context.Context, h seqfile.SeqHandle) ([]se } return data, 0 } + +// LINT.ThenChange(../../fsimpl/proc/tasks_net.go) |