diff options
| author | Zach Koopmans <zkoopmans@google.com> | 2021-07-01 12:02:59 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-01 12:05:19 -0700 |
| commit | 590b8d3e99dd24d2bb625d00fa99fbc9296dfe2b (patch) | |
| tree | 520cfce78c69fc6ec77be9fa78e041152cb6dd8b /pkg/usermem | |
| parent | 07ffecef83bd31e78786af901c49a7be93b20517 (diff) | |
[syserror] Update several syserror errors to linuxerr equivalents.
Update/remove most syserror errors to linuxerr equivalents. For list
of removed errors, see //pkg/syserror/syserror.go.
PiperOrigin-RevId: 382574582
Diffstat (limited to 'pkg/usermem')
| -rw-r--r-- | pkg/usermem/usermem.go | 2 | ||||
| -rw-r--r-- | pkg/usermem/usermem_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/usermem/usermem.go b/pkg/usermem/usermem.go index 483e64c1e..ca852558e 100644 --- a/pkg/usermem/usermem.go +++ b/pkg/usermem/usermem.go @@ -244,7 +244,7 @@ func CopyStringIn(ctx context.Context, uio IO, addr hostarch.Addr, maxlen int, o } addr = end } - return gohacks.StringFromImmutableBytes(buf), syserror.ENAMETOOLONG + return gohacks.StringFromImmutableBytes(buf), linuxerr.ENAMETOOLONG } // CopyOutVec copies bytes from src to the memory mapped at ars in uio. The diff --git a/pkg/usermem/usermem_test.go b/pkg/usermem/usermem_test.go index 4fedb57a5..597770ca7 100644 --- a/pkg/usermem/usermem_test.go +++ b/pkg/usermem/usermem_test.go @@ -214,7 +214,7 @@ func TestCopyStringInNoTerminatingZeroByte(t *testing.T) { func TestCopyStringInTruncatedByMaxlen(t *testing.T) { got, err := CopyStringIn(newContext(), newBytesIOString(strings.Repeat("A", 10)), 0, 5, IOOpts{}) - if want, wantErr := strings.Repeat("A", 5), syserror.ENAMETOOLONG; got != want || err != wantErr { + if want, wantErr := strings.Repeat("A", 5), linuxerr.ENAMETOOLONG; got != want || err != wantErr { t.Errorf("CopyStringIn: got (%q, %v), wanted (%q, %v)", got, err, want, wantErr) } } |