summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/fsimpl/devpts/terminal.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2021-02-11 19:17:28 +0000
committergVisor bot <gvisor-bot@google.com>2021-02-11 19:17:28 +0000
commitf7d56875d020ecadba2dfc355ed3ecf02978530e (patch)
treef8147eec23da39394cfce82b958bf66477a02722 /pkg/sentry/fsimpl/devpts/terminal.go
parentbb24bdc0d84656283f8be86c539f21d1570f8757 (diff)
parentae8d966f5af0bba9978a1aedac64038ef65a4cc9 (diff)
Merge release-20210201.0-86-gae8d966f5 (automated)
Diffstat (limited to 'pkg/sentry/fsimpl/devpts/terminal.go')
-rw-r--r--pkg/sentry/fsimpl/devpts/terminal.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/fsimpl/devpts/terminal.go b/pkg/sentry/fsimpl/devpts/terminal.go
index 510bd6d89..d9e0164a6 100644
--- a/pkg/sentry/fsimpl/devpts/terminal.go
+++ b/pkg/sentry/fsimpl/devpts/terminal.go
@@ -54,18 +54,18 @@ func newTerminal(n uint32) *Terminal {
// setControllingTTY makes tm the controlling terminal of the calling thread
// group.
-func (tm *Terminal) setControllingTTY(ctx context.Context, args arch.SyscallArguments, isMaster bool) error {
+func (tm *Terminal) setControllingTTY(ctx context.Context, steal bool, isMaster, isReadable bool) error {
task := kernel.TaskFromContext(ctx)
if task == nil {
panic("setControllingTTY must be called from a task context")
}
- return task.ThreadGroup().SetControllingTTY(tm.tty(isMaster), args[2].Int())
+ return task.ThreadGroup().SetControllingTTY(tm.tty(isMaster), steal, isReadable)
}
// releaseControllingTTY removes tm as the controlling terminal of the calling
// thread group.
-func (tm *Terminal) releaseControllingTTY(ctx context.Context, args arch.SyscallArguments, isMaster bool) error {
+func (tm *Terminal) releaseControllingTTY(ctx context.Context, isMaster bool) error {
task := kernel.TaskFromContext(ctx)
if task == nil {
panic("releaseControllingTTY must be called from a task context")