summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fsimpl/devpts
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-24 01:48:16 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-24 01:48:16 +0000
commit02da1e7f79ef4b77e4e789546108e0e90420da72 (patch)
treef4ab241088244c4d540a450e8034117933e0ac23 /pkg/sentry/fsimpl/devpts
parent16ab991e05d8f511fc6c7e184751fd330e155950 (diff)
parentbac4ebaabfac95f7b467b9c777a890fcf31a42ae (diff)
Merge release-20200622.1-209-gbac4ebaab (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/devpts')
-rw-r--r--pkg/sentry/fsimpl/devpts/slave.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/fsimpl/devpts/slave.go b/pkg/sentry/fsimpl/devpts/slave.go
index 2018b978a..a91cae3ef 100644
--- a/pkg/sentry/fsimpl/devpts/slave.go
+++ b/pkg/sentry/fsimpl/devpts/slave.go
@@ -132,7 +132,7 @@ func (sfd *slaveFileDescription) Write(ctx context.Context, src usermem.IOSequen
return sfd.inode.t.ld.outputQueueWrite(ctx, src)
}
-// Ioctl implements vfs.FileDescripionImpl.Ioctl.
+// Ioctl implements vfs.FileDescriptionImpl.Ioctl.
func (sfd *slaveFileDescription) Ioctl(ctx context.Context, io usermem.IO, args arch.SyscallArguments) (uintptr, error) {
switch cmd := args[1].Uint(); cmd {
case linux.FIONREAD: // linux.FIONREAD == linux.TIOCINQ