summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/socket
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-05-25 10:43:58 -0700
committergVisor bot <gvisor-bot@google.com>2021-05-25 10:43:58 -0700
commit3272400a4f21c22a02c95956e860efde45c42f7c (patch)
tree6eb4ecef37efc2cd138eb1ed1e7991830f77b701 /pkg/sentry/socket
parentf1dd6932e9fa0242bd996931ecb3897efcc9d05e (diff)
parent0636c1c929da3b58d3a34262fbc6567f86bfb594 (diff)
Merge pull request #6027 from liornm:fix-unused-flag
PiperOrigin-RevId: 375740504
Diffstat (limited to 'pkg/sentry/socket')
-rw-r--r--pkg/sentry/socket/netstack/tun.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/socket/netstack/tun.go b/pkg/sentry/socket/netstack/tun.go
index 288dd0c9e..c7ed52702 100644
--- a/pkg/sentry/socket/netstack/tun.go
+++ b/pkg/sentry/socket/netstack/tun.go
@@ -40,7 +40,7 @@ func LinuxToTUNFlags(flags uint16) (tun.Flags, error) {
// Linux adds IFF_NOFILTER (the same value as IFF_NO_PI unfortunately)
// when there is no sk_filter. See __tun_chr_ioctl() in
// net/drivers/tun.c.
- if flags&^uint16(linux.IFF_TUN|linux.IFF_TAP|linux.IFF_NO_PI) != 0 {
+ if flags&^uint16(linux.IFF_TUN|linux.IFF_TAP|linux.IFF_NO_PI|linux.IFF_ONE_QUEUE) != 0 {
return tun.Flags{}, syserror.EINVAL
}
return tun.Flags{