From 54b71221c0b7a9159f369263ea6189bdba4eac3a Mon Sep 17 00:00:00 2001
From: Zach Koopmans <zkoopmans@google.com>
Date: Tue, 29 Jun 2021 15:05:27 -0700
Subject: [syserror] Change syserror to linuxerr for E2BIG, EADDRINUSE, and
 EINVAL

Remove three syserror entries duplicated in linuxerr. Because of the
linuxerr.Equals method, this is a mere change of return values from
syserror to linuxerr definitions.

Done with only these three errnos as CLs removing all grow to a significantly
large size.

PiperOrigin-RevId: 382173835
---
 pkg/usermem/BUILD           | 1 +
 pkg/usermem/bytes_io.go     | 5 +++--
 pkg/usermem/usermem.go      | 8 ++++----
 pkg/usermem/usermem_test.go | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'pkg/usermem')

diff --git a/pkg/usermem/BUILD b/pkg/usermem/BUILD
index 229a8341b..54674ee88 100644
--- a/pkg/usermem/BUILD
+++ b/pkg/usermem/BUILD
@@ -14,6 +14,7 @@ go_library(
     deps = [
         "//pkg/atomicbitops",
         "//pkg/context",
+        "//pkg/errors/linuxerr",
         "//pkg/gohacks",
         "//pkg/hostarch",
         "//pkg/safemem",
diff --git a/pkg/usermem/bytes_io.go b/pkg/usermem/bytes_io.go
index 3da3c0294..4c97b9136 100644
--- a/pkg/usermem/bytes_io.go
+++ b/pkg/usermem/bytes_io.go
@@ -16,6 +16,7 @@ package usermem
 
 import (
 	"gvisor.dev/gvisor/pkg/context"
+	"gvisor.dev/gvisor/pkg/errors/linuxerr"
 	"gvisor.dev/gvisor/pkg/hostarch"
 	"gvisor.dev/gvisor/pkg/safemem"
 	"gvisor.dev/gvisor/pkg/syserror"
@@ -51,7 +52,7 @@ func (b *BytesIO) CopyIn(ctx context.Context, addr hostarch.Addr, dst []byte, op
 // ZeroOut implements IO.ZeroOut.
 func (b *BytesIO) ZeroOut(ctx context.Context, addr hostarch.Addr, toZero int64, opts IOOpts) (int64, error) {
 	if toZero > int64(maxInt) {
-		return 0, syserror.EINVAL
+		return 0, linuxerr.EINVAL
 	}
 	rngN, rngErr := b.rangeCheck(addr, int(toZero))
 	if rngN == 0 {
@@ -89,7 +90,7 @@ func (b *BytesIO) rangeCheck(addr hostarch.Addr, length int) (int, error) {
 		return 0, nil
 	}
 	if length < 0 {
-		return 0, syserror.EINVAL
+		return 0, linuxerr.EINVAL
 	}
 	max := hostarch.Addr(len(b.Bytes))
 	if addr >= max {
diff --git a/pkg/usermem/usermem.go b/pkg/usermem/usermem.go
index 0d6d25e50..483e64c1e 100644
--- a/pkg/usermem/usermem.go
+++ b/pkg/usermem/usermem.go
@@ -22,11 +22,11 @@ import (
 	"strconv"
 
 	"gvisor.dev/gvisor/pkg/context"
+	"gvisor.dev/gvisor/pkg/errors/linuxerr"
 	"gvisor.dev/gvisor/pkg/gohacks"
+	"gvisor.dev/gvisor/pkg/hostarch"
 	"gvisor.dev/gvisor/pkg/safemem"
 	"gvisor.dev/gvisor/pkg/syserror"
-
-	"gvisor.dev/gvisor/pkg/hostarch"
 )
 
 // IO provides access to the contents of a virtual memory space.
@@ -382,7 +382,7 @@ func CopyInt32StringsInVec(ctx context.Context, uio IO, ars hostarch.AddrRangeSe
 		// Parse a single value.
 		val, err := strconv.ParseInt(string(buf[i:nextI]), 10, 32)
 		if err != nil {
-			return int64(i), syserror.EINVAL
+			return int64(i), linuxerr.EINVAL
 		}
 		dsts[j] = int32(val)
 
@@ -398,7 +398,7 @@ func CopyInt32StringsInVec(ctx context.Context, uio IO, ars hostarch.AddrRangeSe
 		return int64(i), cperr
 	}
 	if j == 0 {
-		return int64(i), syserror.EINVAL
+		return int64(i), linuxerr.EINVAL
 	}
 	return int64(i), nil
 }
diff --git a/pkg/usermem/usermem_test.go b/pkg/usermem/usermem_test.go
index 6ef2b571f..4fedb57a5 100644
--- a/pkg/usermem/usermem_test.go
+++ b/pkg/usermem/usermem_test.go
@@ -274,7 +274,7 @@ func TestCopyInt32StringsInVecRequiresOneValidValue(t *testing.T) {
 			initial := []int32{1, 2}
 			dsts := append([]int32(nil), initial...)
 			if n, err := CopyInt32StringsInVec(newContext(), src.IO, src.Addrs, dsts, src.Opts); !linuxerr.Equals(linuxerr.EINVAL, err) {
-				t.Errorf("CopyInt32StringsInVec: got (%d, %v), wanted (_, %v)", n, err, syserror.EINVAL)
+				t.Errorf("CopyInt32StringsInVec: got (%d, %v), wanted (_, %v)", n, err, linuxerr.EINVAL)
 			}
 			if !reflect.DeepEqual(dsts, initial) {
 				t.Errorf("dsts: got %v, wanted %v", dsts, initial)
-- 
cgit v1.2.3