diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-01 21:46:57 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-01 21:46:57 +0000 |
| commit | dbd886176ac62b526c81fcda13da63c74d46be98 (patch) | |
| tree | 95829e05bd49451d8993a7cfcbc07465a13164d2 /pkg/sentry/fsimpl/devpts/master.go | |
| parent | 302245568e5f5286ac6cce38991ea3b9a17a64b7 (diff) | |
| parent | 2eaf54dd597d8aaa56ad6274e0c1e585d9b9c063 (diff) | |
Merge release-20200818.0-102-g2eaf54dd5 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/devpts/master.go')
| -rw-r--r-- | pkg/sentry/fsimpl/devpts/master.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/fsimpl/devpts/master.go b/pkg/sentry/fsimpl/devpts/master.go index 3422db6a4..d07e1ded8 100644 --- a/pkg/sentry/fsimpl/devpts/master.go +++ b/pkg/sentry/fsimpl/devpts/master.go @@ -145,11 +145,11 @@ func (mfd *masterFileDescription) Ioctl(ctx context.Context, io usermem.IO, args return 0, mfd.t.ld.outputQueueReadSize(t, io, args) case linux.TCGETS: // N.B. TCGETS on the master actually returns the configuration - // of the slave end. + // of the replica end. return mfd.t.ld.getTermios(t, args) case linux.TCSETS: // N.B. TCSETS on the master actually affects the configuration - // of the slave end. + // of the replica end. return mfd.t.ld.setTermios(t, args) case linux.TCSETSW: // TODO(b/29356795): This should drain the output queue first. |