Merge release-20210628.0-8-g54b71221c (automated)

3 files changed, 25 insertions, 23 deletions

diff --git a/pkg/sentry/socket/control/control.go b/pkg/sentry/socket/control/control.go
index 235b9c306..64958b6ec 100644
--- a/pkg/sentry/socket/control/control.go
+++ b/pkg/sentry/socket/control/control.go
@@ -20,6 +20,7 @@ import (
 	"gvisor.dev/gvisor/pkg/abi/linux"
 	"gvisor.dev/gvisor/pkg/bits"
 	"gvisor.dev/gvisor/pkg/context"
+	"gvisor.dev/gvisor/pkg/errors/linuxerr"
 	"gvisor.dev/gvisor/pkg/hostarch"
 	"gvisor.dev/gvisor/pkg/marshal"
 	"gvisor.dev/gvisor/pkg/marshal/primitive"
@@ -473,17 +474,17 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 
 	for i := 0; i < len(buf); {
 		if i+linux.SizeOfControlMessageHeader > len(buf) {
-			return cmsgs, syserror.EINVAL
+			return cmsgs, linuxerr.EINVAL
 		}
 
 		var h linux.ControlMessageHeader
 		h.UnmarshalUnsafe(buf[i : i+linux.SizeOfControlMessageHeader])
 
 		if h.Length < uint64(linux.SizeOfControlMessageHeader) {
-			return socket.ControlMessages{}, syserror.EINVAL
+			return socket.ControlMessages{}, linuxerr.EINVAL
 		}
 		if h.Length > uint64(len(buf)-i) {
-			return socket.ControlMessages{}, syserror.EINVAL
+			return socket.ControlMessages{}, linuxerr.EINVAL
 		}
 
 		i += linux.SizeOfControlMessageHeader
@@ -497,7 +498,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 				numRights := rightsSize / linux.SizeOfControlMessageRight
 
 				if len(fds)+numRights > linux.SCM_MAX_FD {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 
 				for j := i; j < i+rightsSize; j += linux.SizeOfControlMessageRight {
@@ -508,7 +509,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 
 			case linux.SCM_CREDENTIALS:
 				if length < linux.SizeOfControlMessageCredentials {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 
 				var creds linux.ControlMessageCredentials
@@ -522,7 +523,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 
 			case linux.SO_TIMESTAMP:
 				if length < linux.SizeOfTimeval {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 				var ts linux.Timeval
 				ts.UnmarshalUnsafe(buf[i : i+linux.SizeOfTimeval])
@@ -532,13 +533,13 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 
 			default:
 				// Unknown message type.
-				return socket.ControlMessages{}, syserror.EINVAL
+				return socket.ControlMessages{}, linuxerr.EINVAL
 			}
 		case linux.SOL_IP:
 			switch h.Type {
 			case linux.IP_TOS:
 				if length < linux.SizeOfControlMessageTOS {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 				cmsgs.IP.HasTOS = true
 				var tos primitive.Uint8
@@ -548,7 +549,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 
 			case linux.IP_PKTINFO:
 				if length < linux.SizeOfControlMessageIPPacketInfo {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 
 				cmsgs.IP.HasIPPacketInfo = true
@@ -561,7 +562,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 			case linux.IP_RECVORIGDSTADDR:
 				var addr linux.SockAddrInet
 				if length < addr.SizeBytes() {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 				addr.UnmarshalUnsafe(buf[i : i+addr.SizeBytes()])
 				cmsgs.IP.OriginalDstAddress = &addr
@@ -570,7 +571,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 			case linux.IP_RECVERR:
 				var errCmsg linux.SockErrCMsgIPv4
 				if length < errCmsg.SizeBytes() {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 
 				errCmsg.UnmarshalBytes(buf[i : i+errCmsg.SizeBytes()])
@@ -578,13 +579,13 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 				i += bits.AlignUp(length, width)
 
 			default:
-				return socket.ControlMessages{}, syserror.EINVAL
+				return socket.ControlMessages{}, linuxerr.EINVAL
 			}
 		case linux.SOL_IPV6:
 			switch h.Type {
 			case linux.IPV6_TCLASS:
 				if length < linux.SizeOfControlMessageTClass {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 				cmsgs.IP.HasTClass = true
 				var tclass primitive.Uint32
@@ -595,7 +596,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 			case linux.IPV6_RECVORIGDSTADDR:
 				var addr linux.SockAddrInet6
 				if length < addr.SizeBytes() {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 				addr.UnmarshalUnsafe(buf[i : i+addr.SizeBytes()])
 				cmsgs.IP.OriginalDstAddress = &addr
@@ -604,7 +605,7 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 			case linux.IPV6_RECVERR:
 				var errCmsg linux.SockErrCMsgIPv6
 				if length < errCmsg.SizeBytes() {
-					return socket.ControlMessages{}, syserror.EINVAL
+					return socket.ControlMessages{}, linuxerr.EINVAL
 				}
 
 				errCmsg.UnmarshalBytes(buf[i : i+errCmsg.SizeBytes()])
@@ -612,10 +613,10 @@ func Parse(t *kernel.Task, socketOrEndpoint interface{}, buf []byte, width uint)
 				i += bits.AlignUp(length, width)
 
 			default:
-				return socket.ControlMessages{}, syserror.EINVAL
+				return socket.ControlMessages{}, linuxerr.EINVAL
 			}
 		default:
-			return socket.ControlMessages{}, syserror.EINVAL
+			return socket.ControlMessages{}, linuxerr.EINVAL
 		}
 	}
 
diff --git a/pkg/sentry/socket/netstack/stack.go b/pkg/sentry/socket/netstack/stack.go
index eef5e6519..9d343b671 100644
--- a/pkg/sentry/socket/netstack/stack.go
+++ b/pkg/sentry/socket/netstack/stack.go
@@ -18,6 +18,7 @@ import (
 	"fmt"
 
 	"gvisor.dev/gvisor/pkg/abi/linux"
+	"gvisor.dev/gvisor/pkg/errors/linuxerr"
 	"gvisor.dev/gvisor/pkg/log"
 	"gvisor.dev/gvisor/pkg/sentry/inet"
 	"gvisor.dev/gvisor/pkg/syserr"
@@ -110,19 +111,19 @@ func convertAddr(addr inet.InterfaceAddr) (tcpip.ProtocolAddress, error) {
 	switch addr.Family {
 	case linux.AF_INET:
 		if len(addr.Addr) != header.IPv4AddressSize {
-			return protocolAddress, syserror.EINVAL
+			return protocolAddress, linuxerr.EINVAL
 		}
 		if addr.PrefixLen > header.IPv4AddressSize*8 {
-			return protocolAddress, syserror.EINVAL
+			return protocolAddress, linuxerr.EINVAL
 		}
 		protocol = ipv4.ProtocolNumber
 		address = tcpip.Address(addr.Addr)
 	case linux.AF_INET6:
 		if len(addr.Addr) != header.IPv6AddressSize {
-			return protocolAddress, syserror.EINVAL
+			return protocolAddress, linuxerr.EINVAL
 		}
 		if addr.PrefixLen > header.IPv6AddressSize*8 {
-			return protocolAddress, syserror.EINVAL
+			return protocolAddress, linuxerr.EINVAL
 		}
 		protocol = ipv6.ProtocolNumber
 		address = tcpip.Address(addr.Addr)
diff --git a/pkg/sentry/socket/netstack/tun.go b/pkg/sentry/socket/netstack/tun.go
index c7ed52702..e67fe9700 100644
--- a/pkg/sentry/socket/netstack/tun.go
+++ b/pkg/sentry/socket/netstack/tun.go
@@ -16,7 +16,7 @@ package netstack
 
 import (
 	"gvisor.dev/gvisor/pkg/abi/linux"
-	"gvisor.dev/gvisor/pkg/syserror"
+	"gvisor.dev/gvisor/pkg/errors/linuxerr"
 	"gvisor.dev/gvisor/pkg/tcpip/link/tun"
 )
 
@@ -41,7 +41,7 @@ func LinuxToTUNFlags(flags uint16) (tun.Flags, error) {
 	// 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|linux.IFF_ONE_QUEUE) != 0 {
-		return tun.Flags{}, syserror.EINVAL
+		return tun.Flags{}, linuxerr.EINVAL
 	}
 	return tun.Flags{
 		TUN:          flags&linux.IFF_TUN != 0,