From e3fdd1593217894328d5a917bbc356d0a7d145f0 Mon Sep 17 00:00:00 2001
From: Zach Koopmans <zkoopmans@google.com>
Date: Mon, 12 Jul 2021 15:24:04 -0700
Subject: [syserror] Update syserror to linuxerr for more errors.

Update the following from syserror to the linuxerr equivalent:
EEXIST
EFAULT
ENOTDIR
ENOTTY
EOPNOTSUPP
ERANGE
ESRCH

PiperOrigin-RevId: 384329869
---
 pkg/sentry/fs/host/tty.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkg/sentry/fs/host/tty.go')

diff --git a/pkg/sentry/fs/host/tty.go b/pkg/sentry/fs/host/tty.go
index c7010f35c..6f38b25c3 100644
--- a/pkg/sentry/fs/host/tty.go
+++ b/pkg/sentry/fs/host/tty.go
@@ -127,7 +127,7 @@ func (t *TTYFileOperations) Release(ctx context.Context) {
 func (t *TTYFileOperations) Ioctl(ctx context.Context, _ *fs.File, io usermem.IO, args arch.SyscallArguments) (uintptr, error) {
 	task := kernel.TaskFromContext(ctx)
 	if task == nil {
-		return 0, syserror.ENOTTY
+		return 0, linuxerr.ENOTTY
 	}
 
 	// Ignore arg[0].  This is the real FD:
@@ -168,7 +168,7 @@ func (t *TTYFileOperations) Ioctl(ctx context.Context, _ *fs.File, io usermem.IO
 
 		pidns := kernel.PIDNamespaceFromContext(ctx)
 		if pidns == nil {
-			return 0, syserror.ENOTTY
+			return 0, linuxerr.ENOTTY
 		}
 
 		t.mu.Lock()
@@ -193,7 +193,7 @@ func (t *TTYFileOperations) Ioctl(ctx context.Context, _ *fs.File, io usermem.IO
 			// drivers/tty/tty_io.c:tiocspgrp() converts -EIO from
 			// tty_check_change() to -ENOTTY.
 			if linuxerr.Equals(linuxerr.EIO, err) {
-				return 0, syserror.ENOTTY
+				return 0, linuxerr.ENOTTY
 			}
 			return 0, err
 		}
@@ -201,7 +201,7 @@ func (t *TTYFileOperations) Ioctl(ctx context.Context, _ *fs.File, io usermem.IO
 		// Check that calling task's process group is in the TTY
 		// session.
 		if task.ThreadGroup().Session() != t.session {
-			return 0, syserror.ENOTTY
+			return 0, linuxerr.ENOTTY
 		}
 
 		var pgIDP primitive.Int32
@@ -219,7 +219,7 @@ func (t *TTYFileOperations) Ioctl(ctx context.Context, _ *fs.File, io usermem.IO
 		pidns := task.PIDNamespace()
 		pg := pidns.ProcessGroupWithID(pgID)
 		if pg == nil {
-			return 0, syserror.ESRCH
+			return 0, linuxerr.ESRCH
 		}
 
 		// Check that new process group is in the TTY session.
@@ -284,7 +284,7 @@ func (t *TTYFileOperations) Ioctl(ctx context.Context, _ *fs.File, io usermem.IO
 		unimpl.EmitUnimplementedEvent(ctx)
 		fallthrough
 	default:
-		return 0, syserror.ENOTTY
+		return 0, linuxerr.ENOTTY
 	}
 }
 
-- 
cgit v1.2.3