summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorMichael Pratt <mpratt@google.com>2018-08-02 15:55:19 -0700
committerShentubot <shentubot@google.com>2018-08-02 15:56:40 -0700
commitb6a37ab9d96b382e26e3836a42ea485c48a521a8 (patch)
treec3af1a279b9dce1864b59620ede88f6630e2badd /pkg
parent4c1167de4ee2aa7b71729ff8b1c742b4183168d1 (diff)
Update comment reference
PiperOrigin-RevId: 207180809 Change-Id: I08c264812919e81b2c56fdd4a9ef06924de8b52f
Diffstat (limited to 'pkg')
-rw-r--r--pkg/abi/linux/tty.go24
-rw-r--r--pkg/sentry/fs/mount.go8
-rw-r--r--pkg/sentry/syscalls/linux/sys_prctl.go2
3 files changed, 17 insertions, 17 deletions
diff --git a/pkg/abi/linux/tty.go b/pkg/abi/linux/tty.go
index b640f7627..8c611d22a 100644
--- a/pkg/abi/linux/tty.go
+++ b/pkg/abi/linux/tty.go
@@ -286,18 +286,18 @@ var DefaultControlCharacters = [NumControlCharacters]uint8{
'\x7f', // VERASE = DEL
ControlCharacter('U'), // VKILL = ^U
ControlCharacter('D'), // VEOF = ^D
- 0, // VTIME
- 1, // VMIN
- 0, // VSWTC
- ControlCharacter('Q'), // VSTART = ^Q
- ControlCharacter('S'), // VSTOP = ^S
- ControlCharacter('Z'), // VSUSP = ^Z
- 0, // VEOL
- ControlCharacter('R'), // VREPRINT = ^R
- ControlCharacter('O'), // VDISCARD = ^O
- ControlCharacter('W'), // VWERASE = ^W
- ControlCharacter('V'), // VLNEXT = ^V
- 0, // VEOL2
+ 0, // VTIME
+ 1, // VMIN
+ 0, // VSWTC
+ ControlCharacter('Q'), // VSTART = ^Q
+ ControlCharacter('S'), // VSTOP = ^S
+ ControlCharacter('Z'), // VSUSP = ^Z
+ 0, // VEOL
+ ControlCharacter('R'), // VREPRINT = ^R
+ ControlCharacter('O'), // VDISCARD = ^O
+ ControlCharacter('W'), // VWERASE = ^W
+ ControlCharacter('V'), // VLNEXT = ^V
+ 0, // VEOL2
}
// MasterTermios is the terminal configuration of the master end of a Unix98
diff --git a/pkg/sentry/fs/mount.go b/pkg/sentry/fs/mount.go
index 4ede767f9..c72372929 100644
--- a/pkg/sentry/fs/mount.go
+++ b/pkg/sentry/fs/mount.go
@@ -159,10 +159,10 @@ const defaultDirentCacheSize uint64 = 1000
func NewMountSource(mops MountSourceOperations, filesystem Filesystem, flags MountSourceFlags) *MountSource {
return &MountSource{
MountSourceOperations: mops,
- Flags: flags,
- Filesystem: filesystem,
- fscache: NewDirentCache(defaultDirentCacheSize),
- children: make(map[*MountSource]struct{}),
+ Flags: flags,
+ Filesystem: filesystem,
+ fscache: NewDirentCache(defaultDirentCacheSize),
+ children: make(map[*MountSource]struct{}),
}
}
diff --git a/pkg/sentry/syscalls/linux/sys_prctl.go b/pkg/sentry/syscalls/linux/sys_prctl.go
index 911fef658..a1242acd3 100644
--- a/pkg/sentry/syscalls/linux/sys_prctl.go
+++ b/pkg/sentry/syscalls/linux/sys_prctl.go
@@ -113,7 +113,7 @@ func Prctl(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.Syscall
return 0, nil, syscall.EINVAL
}
// no_new_privs is assumed to always be set. See
- // auth.Credentials.UpdateForExec.
+ // kernel.Task.updateCredsForExec.
return 0, nil, nil
case linux.PR_GET_NO_NEW_PRIVS: