Merge release-20210628.0-8-g54b71221c (automated)

2 files changed, 4 insertions, 3 deletions

diff --git a/pkg/sentry/loader/elf.go b/pkg/sentry/loader/elf.go
index 4c7666e33..13ab7ea23 100644
--- a/pkg/sentry/loader/elf.go
+++ b/pkg/sentry/loader/elf.go
@@ -518,13 +518,13 @@ func loadParsedELF(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, in
 		start, ok = start.AddLength(uint64(offset))
 		if !ok {
 			ctx.Infof(fmt.Sprintf("Start %#x + offset %#x overflows?", start, offset))
-			return loadedELF{}, syserror.EINVAL
+			return loadedELF{}, linuxerr.EINVAL
 		}
 
 		end, ok = end.AddLength(uint64(offset))
 		if !ok {
 			ctx.Infof(fmt.Sprintf("End %#x + offset %#x overflows?", end, offset))
-			return loadedELF{}, syserror.EINVAL
+			return loadedELF{}, linuxerr.EINVAL
 		}
 
 		info.entry, ok = info.entry.AddLength(uint64(offset))
diff --git a/pkg/sentry/loader/vdso.go b/pkg/sentry/loader/vdso.go
index fd54261fd..054ef1723 100644
--- a/pkg/sentry/loader/vdso.go
+++ b/pkg/sentry/loader/vdso.go
@@ -23,6 +23,7 @@ import (
 
 	"gvisor.dev/gvisor/pkg/abi"
 	"gvisor.dev/gvisor/pkg/context"
+	"gvisor.dev/gvisor/pkg/errors/linuxerr"
 	"gvisor.dev/gvisor/pkg/hostarch"
 	"gvisor.dev/gvisor/pkg/log"
 	"gvisor.dev/gvisor/pkg/safemem"
@@ -58,7 +59,7 @@ type byteFullReader struct {
 
 func (b *byteFullReader) ReadFull(ctx context.Context, dst usermem.IOSequence, offset int64) (int64, error) {
 	if offset < 0 {
-		return 0, syserror.EINVAL
+		return 0, linuxerr.EINVAL
 	}
 	if offset >= int64(len(b.data)) {
 		return 0, io.EOF