Merge release-20210806.0-21-g02370bbd3 (automated)

4 files changed, 51 insertions, 54 deletions

diff --git a/pkg/sentry/loader/elf.go b/pkg/sentry/loader/elf.go
index 577374fa4..fb213d109 100644
--- a/pkg/sentry/loader/elf.go
+++ b/pkg/sentry/loader/elf.go
@@ -32,7 +32,6 @@ import (
 	"gvisor.dev/gvisor/pkg/sentry/limits"
 	"gvisor.dev/gvisor/pkg/sentry/memmap"
 	"gvisor.dev/gvisor/pkg/sentry/mm"
-	"gvisor.dev/gvisor/pkg/syserror"
 	"gvisor.dev/gvisor/pkg/usermem"
 )
 
@@ -116,7 +115,7 @@ func parseHeader(ctx context.Context, f fullReader) (elfInfo, error) {
 		log.Infof("Error reading ELF ident: %v", err)
 		// The entire ident array always exists.
 		if err == io.EOF || err == io.ErrUnexpectedEOF {
-			err = syserror.ENOEXEC
+			err = linuxerr.ENOEXEC
 		}
 		return elfInfo{}, err
 	}
@@ -124,22 +123,22 @@ func parseHeader(ctx context.Context, f fullReader) (elfInfo, error) {
 	// Only some callers pre-check the ELF magic.
 	if !bytes.Equal(ident[:len(elfMagic)], []byte(elfMagic)) {
 		log.Infof("File is not an ELF")
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 
 	// We only support 64-bit, little endian binaries
 	if class := elf.Class(ident[elf.EI_CLASS]); class != elf.ELFCLASS64 {
 		log.Infof("Unsupported ELF class: %v", class)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 	if endian := elf.Data(ident[elf.EI_DATA]); endian != elf.ELFDATA2LSB {
 		log.Infof("Unsupported ELF endianness: %v", endian)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 
 	if version := elf.Version(ident[elf.EI_VERSION]); version != elf.EV_CURRENT {
 		log.Infof("Unsupported ELF version: %v", version)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 	// EI_OSABI is ignored by Linux, which is the only OS supported.
 	os := abi.Linux
@@ -151,7 +150,7 @@ func parseHeader(ctx context.Context, f fullReader) (elfInfo, error) {
 		log.Infof("Error reading ELF header: %v", err)
 		// The entire header always exists.
 		if err == io.EOF || err == io.ErrUnexpectedEOF {
-			err = syserror.ENOEXEC
+			err = linuxerr.ENOEXEC
 		}
 		return elfInfo{}, err
 	}
@@ -166,7 +165,7 @@ func parseHeader(ctx context.Context, f fullReader) (elfInfo, error) {
 		a = arch.ARM64
 	default:
 		log.Infof("Unsupported ELF machine %d", machine)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 
 	var sharedObject bool
@@ -178,25 +177,25 @@ func parseHeader(ctx context.Context, f fullReader) (elfInfo, error) {
 		sharedObject = true
 	default:
 		log.Infof("Unsupported ELF type %v", elfType)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 
 	if int(hdr.Phentsize) != prog64Size {
 		log.Infof("Unsupported phdr size %d", hdr.Phentsize)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 	totalPhdrSize := prog64Size * int(hdr.Phnum)
 	if totalPhdrSize < prog64Size {
 		log.Warningf("No phdrs or total phdr size overflows: prog64Size: %d phnum: %d", prog64Size, int(hdr.Phnum))
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 	if totalPhdrSize > maxTotalPhdrSize {
 		log.Infof("Too many phdrs (%d): total size %d > %d", hdr.Phnum, totalPhdrSize, maxTotalPhdrSize)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 	if int64(hdr.Phoff) < 0 || int64(hdr.Phoff+uint64(totalPhdrSize)) < 0 {
 		ctx.Infof("Unsupported phdr offset %d", hdr.Phoff)
-		return elfInfo{}, syserror.ENOEXEC
+		return elfInfo{}, linuxerr.ENOEXEC
 	}
 
 	phdrBuf := make([]byte, totalPhdrSize)
@@ -205,7 +204,7 @@ func parseHeader(ctx context.Context, f fullReader) (elfInfo, error) {
 		log.Infof("Error reading ELF phdrs: %v", err)
 		// If phdrs were specified, they should all exist.
 		if err == io.EOF || err == io.ErrUnexpectedEOF {
-			err = syserror.ENOEXEC
+			err = linuxerr.ENOEXEC
 		}
 		return elfInfo{}, err
 	}
@@ -248,19 +247,19 @@ func mapSegment(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, phdr
 	if !ok {
 		// If offset != 0 we should have ensured this would fit.
 		ctx.Warningf("Computed segment load address overflows: %#x + %#x", phdr.Vaddr, offset)
-		return syserror.ENOEXEC
+		return linuxerr.ENOEXEC
 	}
 	addr -= hostarch.Addr(adjust)
 
 	fileSize := phdr.Filesz + adjust
 	if fileSize < phdr.Filesz {
 		ctx.Infof("Computed segment file size overflows: %#x + %#x", phdr.Filesz, adjust)
-		return syserror.ENOEXEC
+		return linuxerr.ENOEXEC
 	}
 	ms, ok := hostarch.Addr(fileSize).RoundUp()
 	if !ok {
 		ctx.Infof("fileSize %#x too large", fileSize)
-		return syserror.ENOEXEC
+		return linuxerr.ENOEXEC
 	}
 	mapSize := uint64(ms)
 
@@ -321,7 +320,7 @@ func mapSegment(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, phdr
 	memSize := phdr.Memsz + adjust
 	if memSize < phdr.Memsz {
 		ctx.Infof("Computed segment mem size overflows: %#x + %#x", phdr.Memsz, adjust)
-		return syserror.ENOEXEC
+		return linuxerr.ENOEXEC
 	}
 
 	// Allocate more anonymous pages if necessary.
@@ -333,7 +332,7 @@ func mapSegment(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, phdr
 		anonSize, ok := hostarch.Addr(memSize - mapSize).RoundUp()
 		if !ok {
 			ctx.Infof("extra anon pages too large: %#x", memSize-mapSize)
-			return syserror.ENOEXEC
+			return linuxerr.ENOEXEC
 		}
 
 		// N.B. Linux uses vm_brk_flags to map these pages, which only
@@ -423,27 +422,27 @@ func loadParsedELF(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, in
 				// NOTE(b/37474556): Linux allows out-of-order
 				// segments, in violation of the spec.
 				ctx.Infof("PT_LOAD headers out-of-order. %#x < %#x", vaddr, end)
-				return loadedELF{}, syserror.ENOEXEC
+				return loadedELF{}, linuxerr.ENOEXEC
 			}
 			var ok bool
 			end, ok = vaddr.AddLength(phdr.Memsz)
 			if !ok {
 				ctx.Infof("PT_LOAD header size overflows. %#x + %#x", vaddr, phdr.Memsz)
-				return loadedELF{}, syserror.ENOEXEC
+				return loadedELF{}, linuxerr.ENOEXEC
 			}
 
 		case elf.PT_INTERP:
 			if phdr.Filesz < 2 {
 				ctx.Infof("PT_INTERP path too small: %v", phdr.Filesz)
-				return loadedELF{}, syserror.ENOEXEC
+				return loadedELF{}, linuxerr.ENOEXEC
 			}
 			if phdr.Filesz > linux.PATH_MAX {
 				ctx.Infof("PT_INTERP path too big: %v", phdr.Filesz)
-				return loadedELF{}, syserror.ENOEXEC
+				return loadedELF{}, linuxerr.ENOEXEC
 			}
 			if int64(phdr.Off) < 0 || int64(phdr.Off+phdr.Filesz) < 0 {
 				ctx.Infof("Unsupported PT_INTERP offset %d", phdr.Off)
-				return loadedELF{}, syserror.ENOEXEC
+				return loadedELF{}, linuxerr.ENOEXEC
 			}
 
 			path := make([]byte, phdr.Filesz)
@@ -451,12 +450,12 @@ func loadParsedELF(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, in
 			if err != nil {
 				// If an interpreter was specified, it should exist.
 				ctx.Infof("Error reading PT_INTERP path: %v", err)
-				return loadedELF{}, syserror.ENOEXEC
+				return loadedELF{}, linuxerr.ENOEXEC
 			}
 
 			if path[len(path)-1] != 0 {
 				ctx.Infof("PT_INTERP path not NUL-terminated: %v", path)
-				return loadedELF{}, syserror.ENOEXEC
+				return loadedELF{}, linuxerr.ENOEXEC
 			}
 
 			// Strip NUL-terminator and everything beyond from
@@ -498,7 +497,7 @@ func loadParsedELF(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, in
 		totalSize, ok := totalSize.RoundUp()
 		if !ok {
 			ctx.Infof("ELF PT_LOAD segments too big")
-			return loadedELF{}, syserror.ENOEXEC
+			return loadedELF{}, linuxerr.ENOEXEC
 		}
 
 		var err error
@@ -592,7 +591,7 @@ func loadInitialELF(ctx context.Context, m *mm.MemoryManager, fs *cpuid.FeatureS
 	// Check Image Compatibility.
 	if arch.Host != info.arch {
 		ctx.Warningf("Found mismatch for platform %s with ELF type %s", arch.Host.String(), info.arch.String())
-		return loadedELF{}, nil, syserror.ENOEXEC
+		return loadedELF{}, nil, linuxerr.ENOEXEC
 	}
 
 	// Create the arch.Context now so we can prepare the mmap layout before
@@ -681,7 +680,7 @@ func loadELF(ctx context.Context, args LoadArgs) (loadedELF, arch.Context, error
 		if interp.interpreter != "" {
 			// No recursive interpreters!
 			ctx.Infof("Interpreter requires an interpreter")
-			return loadedELF{}, nil, syserror.ENOEXEC
+			return loadedELF{}, nil, linuxerr.ENOEXEC
 		}
 	}
 
diff --git a/pkg/sentry/loader/interpreter.go b/pkg/sentry/loader/interpreter.go
index 3e302d92c..1ec0d7019 100644
--- a/pkg/sentry/loader/interpreter.go
+++ b/pkg/sentry/loader/interpreter.go
@@ -19,8 +19,8 @@ import (
 	"io"
 
 	"gvisor.dev/gvisor/pkg/context"
+	"gvisor.dev/gvisor/pkg/errors/linuxerr"
 	"gvisor.dev/gvisor/pkg/sentry/fsbridge"
-	"gvisor.dev/gvisor/pkg/syserror"
 	"gvisor.dev/gvisor/pkg/usermem"
 )
 
@@ -43,14 +43,14 @@ func parseInterpreterScript(ctx context.Context, filename string, f fsbridge.Fil
 	// Short read is OK.
 	if err != nil && err != io.ErrUnexpectedEOF {
 		if err == io.EOF {
-			err = syserror.ENOEXEC
+			err = linuxerr.ENOEXEC
 		}
 		return "", []string{}, err
 	}
 	line = line[:n]
 
 	if !bytes.Equal(line[:2], []byte(interpreterScriptMagic)) {
-		return "", []string{}, syserror.ENOEXEC
+		return "", []string{}, linuxerr.ENOEXEC
 	}
 	// Ignore #!.
 	line = line[2:]
@@ -82,7 +82,7 @@ func parseInterpreterScript(ctx context.Context, filename string, f fsbridge.Fil
 
 	if string(interp) == "" {
 		ctx.Infof("Interpreter script contains no interpreter: %v", line)
-		return "", []string{}, syserror.ENOEXEC
+		return "", []string{}, linuxerr.ENOEXEC
 	}
 
 	// Build the new argument list:
diff --git a/pkg/sentry/loader/loader.go b/pkg/sentry/loader/loader.go
index 86d0c54cd..6a356779c 100644
--- a/pkg/sentry/loader/loader.go
+++ b/pkg/sentry/loader/loader.go
@@ -35,7 +35,6 @@ import (
 	"gvisor.dev/gvisor/pkg/sentry/mm"
 	"gvisor.dev/gvisor/pkg/sentry/vfs"
 	"gvisor.dev/gvisor/pkg/syserr"
-	"gvisor.dev/gvisor/pkg/syserror"
 	"gvisor.dev/gvisor/pkg/usermem"
 )
 
@@ -91,7 +90,7 @@ type LoadArgs struct {
 func openPath(ctx context.Context, args LoadArgs) (fsbridge.File, error) {
 	if args.Filename == "" {
 		ctx.Infof("cannot open empty name")
-		return nil, syserror.ENOENT
+		return nil, linuxerr.ENOENT
 	}
 
 	// TODO(gvisor.dev/issue/160): Linux requires only execute permission,
@@ -172,7 +171,7 @@ func loadExecutable(ctx context.Context, args LoadArgs) (loadedELF, arch.Context
 		// (e.g., #!a).
 		if err != nil && err != io.ErrUnexpectedEOF {
 			if err == io.EOF {
-				err = syserror.ENOEXEC
+				err = linuxerr.ENOEXEC
 			}
 			return loadedELF{}, nil, nil, nil, err
 		}
@@ -190,7 +189,7 @@ func loadExecutable(ctx context.Context, args LoadArgs) (loadedELF, arch.Context
 
 		case bytes.Equal(hdr[:2], []byte(interpreterScriptMagic)):
 			if args.CloseOnExec {
-				return loadedELF{}, nil, nil, nil, syserror.ENOENT
+				return loadedELF{}, nil, nil, nil, linuxerr.ENOENT
 			}
 			args.Filename, args.Argv, err = parseInterpreterScript(ctx, args.Filename, args.File, args.Argv)
 			if err != nil {
@@ -202,7 +201,7 @@ func loadExecutable(ctx context.Context, args LoadArgs) (loadedELF, arch.Context
 
 		default:
 			ctx.Infof("Unknown magic: %v", hdr)
-			return loadedELF{}, nil, nil, nil, syserror.ENOEXEC
+			return loadedELF{}, nil, nil, nil, linuxerr.ENOEXEC
 		}
 		// Set to nil in case we loop on a Interpreter Script.
 		args.File = nil
diff --git a/pkg/sentry/loader/vdso.go b/pkg/sentry/loader/vdso.go
index 054ef1723..3abd2ee7d 100644
--- a/pkg/sentry/loader/vdso.go
+++ b/pkg/sentry/loader/vdso.go
@@ -34,7 +34,6 @@ import (
 	"gvisor.dev/gvisor/pkg/sentry/pgalloc"
 	"gvisor.dev/gvisor/pkg/sentry/uniqueid"
 	"gvisor.dev/gvisor/pkg/sentry/usage"
-	"gvisor.dev/gvisor/pkg/syserror"
 	"gvisor.dev/gvisor/pkg/usermem"
 )
 
@@ -102,14 +101,14 @@ func validateVDSO(ctx context.Context, f fullReader, size uint64) (elfInfo, erro
 			first = &info.phdrs[i]
 			if phdr.Off != 0 {
 				log.Warningf("First PT_LOAD segment has non-zero file offset")
-				return elfInfo{}, syserror.ENOEXEC
+				return elfInfo{}, linuxerr.ENOEXEC
 			}
 		}
 
 		memoryOffset := phdr.Vaddr - first.Vaddr
 		if memoryOffset != phdr.Off {
 			log.Warningf("PT_LOAD segment memory offset %#x != file offset %#x", memoryOffset, phdr.Off)
-			return elfInfo{}, syserror.ENOEXEC
+			return elfInfo{}, linuxerr.ENOEXEC
 		}
 
 		// memsz larger than filesz means that extra zeroed space should be
@@ -118,24 +117,24 @@ func validateVDSO(ctx context.Context, f fullReader, size uint64) (elfInfo, erro
 		// zeroes.
 		if phdr.Memsz != phdr.Filesz {
 			log.Warningf("PT_LOAD segment memsz %#x != filesz %#x", phdr.Memsz, phdr.Filesz)
-			return elfInfo{}, syserror.ENOEXEC
+			return elfInfo{}, linuxerr.ENOEXEC
 		}
 
 		start := hostarch.Addr(memoryOffset)
 		end, ok := start.AddLength(phdr.Memsz)
 		if !ok {
 			log.Warningf("PT_LOAD segment size overflows: %#x + %#x", start, end)
-			return elfInfo{}, syserror.ENOEXEC
+			return elfInfo{}, linuxerr.ENOEXEC
 		}
 		if uint64(end) > size {
 			log.Warningf("PT_LOAD segment end %#x extends beyond end of file %#x", end, size)
-			return elfInfo{}, syserror.ENOEXEC
+			return elfInfo{}, linuxerr.ENOEXEC
 		}
 
 		if prev != nil {
 			if start < prevEnd {
 				log.Warningf("PT_LOAD segments out of order")
-				return elfInfo{}, syserror.ENOEXEC
+				return elfInfo{}, linuxerr.ENOEXEC
 			}
 
 			// We mprotect entire pages, so each segment must be in
@@ -144,7 +143,7 @@ func validateVDSO(ctx context.Context, f fullReader, size uint64) (elfInfo, erro
 			startPage := start.RoundDown()
 			if prevEndPage >= startPage {
 				log.Warningf("PT_LOAD segments share a page: %#x", prevEndPage)
-				return elfInfo{}, syserror.ENOEXEC
+				return elfInfo{}, linuxerr.ENOEXEC
 			}
 		}
 		prev = &info.phdrs[i]
@@ -271,11 +270,11 @@ func PrepareVDSO(mfp pgalloc.MemoryFileProvider) (*VDSO, error) {
 func loadVDSO(ctx context.Context, m *mm.MemoryManager, v *VDSO, bin loadedELF) (hostarch.Addr, error) {
 	if v.os != bin.os {
 		ctx.Warningf("Binary ELF OS %v and VDSO ELF OS %v differ", bin.os, v.os)
-		return 0, syserror.ENOEXEC
+		return 0, linuxerr.ENOEXEC
 	}
 	if v.arch != bin.arch {
 		ctx.Warningf("Binary ELF arch %v and VDSO ELF arch %v differ", bin.arch, v.arch)
-		return 0, syserror.ENOEXEC
+		return 0, linuxerr.ENOEXEC
 	}
 
 	// Reserve address space for the VDSO and its parameter page, which is
@@ -348,35 +347,35 @@ func loadVDSO(ctx context.Context, m *mm.MemoryManager, v *VDSO, bin loadedELF)
 		segAddr, ok := vdsoAddr.AddLength(memoryOffset)
 		if !ok {
 			ctx.Warningf("PT_LOAD segment address overflows: %#x + %#x", segAddr, memoryOffset)
-			return 0, syserror.ENOEXEC
+			return 0, linuxerr.ENOEXEC
 		}
 		segPage := segAddr.RoundDown()
 		segSize := hostarch.Addr(phdr.Memsz)
 		segSize, ok = segSize.AddLength(segAddr.PageOffset())
 		if !ok {
 			ctx.Warningf("PT_LOAD segment memsize %#x + offset %#x overflows", phdr.Memsz, segAddr.PageOffset())
-			return 0, syserror.ENOEXEC
+			return 0, linuxerr.ENOEXEC
 		}
 		segSize, ok = segSize.RoundUp()
 		if !ok {
 			ctx.Warningf("PT_LOAD segment size overflows: %#x", phdr.Memsz+segAddr.PageOffset())
-			return 0, syserror.ENOEXEC
+			return 0, linuxerr.ENOEXEC
 		}
 		segEnd, ok := segPage.AddLength(uint64(segSize))
 		if !ok {
 			ctx.Warningf("PT_LOAD segment range overflows: %#x + %#x", segAddr, segSize)
-			return 0, syserror.ENOEXEC
+			return 0, linuxerr.ENOEXEC
 		}
 		if segEnd > vdsoEnd {
 			ctx.Warningf("PT_LOAD segment ends beyond VDSO: %#x > %#x", segEnd, vdsoEnd)
-			return 0, syserror.ENOEXEC
+			return 0, linuxerr.ENOEXEC
 		}
 
 		perms := progFlagsAsPerms(phdr.Flags)
 		if perms != hostarch.Read {
 			if err := m.MProtect(segPage, uint64(segSize), perms, false); err != nil {
 				ctx.Warningf("Unable to set PT_LOAD segment protections %+v at [%#x, %#x): %v", perms, segAddr, segEnd, err)
-				return 0, syserror.ENOEXEC
+				return 0, linuxerr.ENOEXEC
 			}
 		}
 	}