diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-08-12 22:24:49 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-12 22:24:49 +0000 |
| commit | 1e598212a50aa7bee03a47cf6c5f3b23254d64ab (patch) | |
| tree | a607ab35c75071350bf9b948e53c1fdac18fe1cf /pkg/sentry/fsimpl/devpts | |
| parent | 05406ffb7547dbe3734450bfbdfb1c271d7867f2 (diff) | |
| parent | 02370bbd315d7e7c2783d7001d014870cf1ef534 (diff) | |
Merge release-20210806.0-21-g02370bbd3 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/devpts')
| -rw-r--r-- | pkg/sentry/fsimpl/devpts/devpts.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/sentry/fsimpl/devpts/devpts.go b/pkg/sentry/fsimpl/devpts/devpts.go index 7a488e9fd..e711debcb 100644 --- a/pkg/sentry/fsimpl/devpts/devpts.go +++ b/pkg/sentry/fsimpl/devpts/devpts.go @@ -29,7 +29,6 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/kernfs" "gvisor.dev/gvisor/pkg/sentry/kernel/auth" "gvisor.dev/gvisor/pkg/sentry/vfs" - "gvisor.dev/gvisor/pkg/syserror" ) // Name is the filesystem name. @@ -180,7 +179,7 @@ func (i *rootInode) allocateTerminal(ctx context.Context, creds *auth.Credential i.mu.Lock() defer i.mu.Unlock() if i.nextIdx == math.MaxUint32 { - return nil, syserror.ENOMEM + return nil, linuxerr.ENOMEM } idx := i.nextIdx i.nextIdx++ @@ -241,7 +240,7 @@ func (i *rootInode) Lookup(ctx context.Context, name string) (kernfs.Inode, erro // Not a static entry. idx, err := strconv.ParseUint(name, 10, 32) if err != nil { - return nil, syserror.ENOENT + return nil, linuxerr.ENOENT } i.mu.Lock() defer i.mu.Unlock() @@ -250,7 +249,7 @@ func (i *rootInode) Lookup(ctx context.Context, name string) (kernfs.Inode, erro return ri, nil } - return nil, syserror.ENOENT + return nil, linuxerr.ENOENT } // IterDirents implements kernfs.Inode.IterDirents. |