diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-07-12 22:31:07 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-12 22:31:07 +0000 |
| commit | cbf3251b8d2ea4b6ab3eff2bd6a4b2804a11706c (patch) | |
| tree | 24b26c36e631a803a71bffeff8f0658247db0fc2 /pkg/sentry/fs/dev | |
| parent | f28c339def09aea90fe60b3abb38215c5e5c8e52 (diff) | |
| parent | e3fdd1593217894328d5a917bbc356d0a7d145f0 (diff) | |
Merge release-20210705.0-11-ge3fdd1593 (automated)
Diffstat (limited to 'pkg/sentry/fs/dev')
| -rw-r--r-- | pkg/sentry/fs/dev/net_tun.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/fs/dev/net_tun.go b/pkg/sentry/fs/dev/net_tun.go index ae9aed7b5..1abf11142 100644 --- a/pkg/sentry/fs/dev/net_tun.go +++ b/pkg/sentry/fs/dev/net_tun.go @@ -25,7 +25,6 @@ import ( "gvisor.dev/gvisor/pkg/sentry/inet" "gvisor.dev/gvisor/pkg/sentry/kernel" "gvisor.dev/gvisor/pkg/sentry/socket/netstack" - "gvisor.dev/gvisor/pkg/syserror" "gvisor.dev/gvisor/pkg/tcpip/link/tun" "gvisor.dev/gvisor/pkg/usermem" "gvisor.dev/gvisor/pkg/waiter" @@ -126,7 +125,7 @@ func (n *netTunFileOperations) Ioctl(ctx context.Context, file *fs.File, io user return 0, err default: - return 0, syserror.ENOTTY + return 0, linuxerr.ENOTTY } } |