diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-08-12 22:24:49 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-12 22:24:49 +0000 |
| commit | 1e598212a50aa7bee03a47cf6c5f3b23254d64ab (patch) | |
| tree | a607ab35c75071350bf9b948e53c1fdac18fe1cf /pkg/sentry/pgalloc | |
| parent | 05406ffb7547dbe3734450bfbdfb1c271d7867f2 (diff) | |
| parent | 02370bbd315d7e7c2783d7001d014870cf1ef534 (diff) | |
Merge release-20210806.0-21-g02370bbd3 (automated)
Diffstat (limited to 'pkg/sentry/pgalloc')
| -rw-r--r-- | pkg/sentry/pgalloc/pgalloc.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/sentry/pgalloc/pgalloc.go b/pkg/sentry/pgalloc/pgalloc.go index 0c8542485..68e17d343 100644 --- a/pkg/sentry/pgalloc/pgalloc.go +++ b/pkg/sentry/pgalloc/pgalloc.go @@ -39,7 +39,6 @@ import ( "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sync" - "gvisor.dev/gvisor/pkg/syserror" ) // MemoryFile is a memmap.File whose pages may be allocated to arbitrary @@ -404,7 +403,7 @@ func (f *MemoryFile) Allocate(length uint64, kind usage.MemoryKind) (memmap.File // Find a range in the underlying file. fr, ok := findAvailableRange(&f.usage, f.fileSize, length, alignment) if !ok { - return memmap.FileRange{}, syserror.ENOMEM + return memmap.FileRange{}, linuxerr.ENOMEM } // Expand the file if needed. |