diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-08-31 02:15:10 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-08-31 02:15:10 +0000 |
commit | 15bc1f77009efefdd417e986507f74f6efd629a4 (patch) | |
tree | c15fed84ebcfdc31ec3540e42b23935291955e50 /pkg/sentry/fs/tty/slave.go | |
parent | 5f40ea3e1fb621e6bcf2dc04bd516003c86808e0 (diff) | |
parent | 0352cf5866ddb5eea24fa35c69e2e43038cfb60a (diff) |
Merge 0352cf58 (automated)
Diffstat (limited to 'pkg/sentry/fs/tty/slave.go')
-rw-r--r-- | pkg/sentry/fs/tty/slave.go | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkg/sentry/fs/tty/slave.go b/pkg/sentry/fs/tty/slave.go index 944c4ada1..e30266404 100644 --- a/pkg/sentry/fs/tty/slave.go +++ b/pkg/sentry/fs/tty/slave.go @@ -152,16 +152,9 @@ func (sf *slaveFileOperations) Ioctl(ctx context.Context, _ *fs.File, io usermem case linux.TIOCSCTTY: // Make the given terminal the controlling terminal of the // calling process. - return 0, sf.si.t.setControllingTTY(ctx, io, args, false /* isMaster */) - case linux.TIOCNOTTY: - // Release this process's controlling terminal. - return 0, sf.si.t.releaseControllingTTY(ctx, io, args, false /* isMaster */) - case linux.TIOCGPGRP: - // Get the foreground process group. - return sf.si.t.foregroundProcessGroup(ctx, io, args, false /* isMaster */) - case linux.TIOCSPGRP: - // Set the foreground process group. - return sf.si.t.setForegroundProcessGroup(ctx, io, args, false /* isMaster */) + // TODO(b/129283598): Implement once we have support for job + // control. + return 0, nil default: maybeEmitUnimplementedEvent(ctx, cmd) return 0, syserror.ENOTTY |