Merge release-20210628.0-16-g590b8d3e9 (automated)

2 files changed, 4 insertions, 4 deletions

diff --git a/pkg/sentry/loader/elf.go b/pkg/sentry/loader/elf.go
index 1db6fbd76..577374fa4 100644
--- a/pkg/sentry/loader/elf.go
+++ b/pkg/sentry/loader/elf.go
@@ -624,18 +624,18 @@ func loadInterpreterELF(ctx context.Context, m *mm.MemoryManager, f fsbridge.Fil
 	if err != nil {
 		if linuxerr.Equals(linuxerr.ENOEXEC, err) {
 			// Bad interpreter.
-			err = syserror.ELIBBAD
+			err = linuxerr.ELIBBAD
 		}
 		return loadedELF{}, err
 	}
 
 	if info.os != initial.os {
 		ctx.Infof("Initial ELF OS %v and interpreter ELF OS %v differ", initial.os, info.os)
-		return loadedELF{}, syserror.ELIBBAD
+		return loadedELF{}, linuxerr.ELIBBAD
 	}
 	if info.arch != initial.arch {
 		ctx.Infof("Initial ELF arch %v and interpreter ELF arch %v differ", initial.arch, info.arch)
-		return loadedELF{}, syserror.ELIBBAD
+		return loadedELF{}, linuxerr.ELIBBAD
 	}
 
 	// The interpreter is not given a load offset, as its location does not
diff --git a/pkg/sentry/loader/loader.go b/pkg/sentry/loader/loader.go
index 7dc884bd5..86d0c54cd 100644
--- a/pkg/sentry/loader/loader.go
+++ b/pkg/sentry/loader/loader.go
@@ -208,7 +208,7 @@ func loadExecutable(ctx context.Context, args LoadArgs) (loadedELF, arch.Context
 		args.File = nil
 	}
 
-	return loadedELF{}, nil, nil, nil, syserror.ELOOP
+	return loadedELF{}, nil, nil, nil, linuxerr.ELOOP
 }
 
 // Load loads args.File into a MemoryManager. If args.File is nil, the path