Merge release-20210806.0-21-g02370bbd3 (automated)

1 files changed, 15 insertions, 16 deletions

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
 			}
 		}
 	}