summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--pkg/log/log.go2
-rw-r--r--pkg/sentry/fs/file.go2
-rw-r--r--pkg/sentry/fs/fsutil/file.go2
-rw-r--r--pkg/sentry/fs/ramfs/dir.go4
-rw-r--r--pkg/sentry/fs/tty/line_discipline.go4
-rw-r--r--pkg/sentry/kernel/semaphore/semaphore.go2
-rw-r--r--pkg/sentry/kernel/task_exit.go2
-rw-r--r--pkg/sentry/mm/vma.go2
-rw-r--r--pkg/sentry/socket/rpcinet/socket.go2
-rw-r--r--pkg/sentry/strace/syscalls.go2
-rw-r--r--pkg/tcpip/header/ipv6.go2
-rw-r--r--pkg/tcpip/stack/stack.go2
-rw-r--r--pkg/tcpip/transport/tcp/snd.go2
-rw-r--r--runsc/sandbox/sandbox.go4
14 files changed, 17 insertions, 17 deletions
diff --git a/pkg/log/log.go b/pkg/log/log.go
index 110e0e196..cdfc0601a 100644
--- a/pkg/log/log.go
+++ b/pkg/log/log.go
@@ -149,7 +149,7 @@ func (t TestEmitter) Emit(level Level, timestamp time.Time, format string, v ...
// Logger is a high-level logging interface. It is in fact, not used within the
// log package. Rather it is provided for others to provide contextual loggers
// that may append some addition information to log statement. BasicLogger
-// satifies this interface, and may be passed around as a Logger.
+// satisfies this interface, and may be passed around as a Logger.
type Logger interface {
// Debugf logs a debug statement.
Debugf(format string, v ...interface{})
diff --git a/pkg/sentry/fs/file.go b/pkg/sentry/fs/file.go
index de2e80bf0..f2683bbd2 100644
--- a/pkg/sentry/fs/file.go
+++ b/pkg/sentry/fs/file.go
@@ -376,7 +376,7 @@ func (r *FileReader) Read(buf []byte) (int, error) {
return int(n), err
}
-// ReadAt implementes io.Reader.ReadAt.
+// ReadAt implements io.Reader.ReadAt.
func (r *FileReader) ReadAt(buf []byte, offset int64) (int, error) {
n, err := r.File.Preadv(r.Ctx, usermem.BytesIOSequence(buf), offset)
return int(n), err
diff --git a/pkg/sentry/fs/fsutil/file.go b/pkg/sentry/fs/fsutil/file.go
index a7329f1c9..b17f11a5a 100644
--- a/pkg/sentry/fs/fsutil/file.go
+++ b/pkg/sentry/fs/fsutil/file.go
@@ -34,7 +34,7 @@ func (NoopRelease) Release() {}
// SeekWithDirCursor is used to implement fs.FileOperations.Seek. If dirCursor
// is not nil and the seek was on a directory, the cursor will be updated.
//
-// Currenly only seeking to 0 on a directory is supported.
+// Currently only seeking to 0 on a directory is supported.
//
// FIXME: Lift directory seeking limitations.
func SeekWithDirCursor(ctx context.Context, file *fs.File, whence fs.SeekWhence, offset int64, dirCursor *string) (int64, error) {
diff --git a/pkg/sentry/fs/ramfs/dir.go b/pkg/sentry/fs/ramfs/dir.go
index bf4cd8dfd..19d5612ed 100644
--- a/pkg/sentry/fs/ramfs/dir.go
+++ b/pkg/sentry/fs/ramfs/dir.go
@@ -103,7 +103,7 @@ func (d *Dir) addChildLocked(name string, inode *fs.Inode) {
}
// Given we're now adding this inode to the directory we must also
- // increase its link count. Similiarly we decremented it in removeChildLocked.
+ // increase its link count. Similarly we decremented it in removeChildLocked.
inode.AddLink()
}
@@ -144,7 +144,7 @@ func (d *Dir) removeChildLocked(ctx context.Context, name string) (*fs.Inode, er
inode.NotifyStatusChange(ctx)
// Given we're now removing this inode to the directory we must also
- // decrease its link count. Similiarly it is increased in addChildLocked.
+ // decrease its link count. Similarly it is increased in addChildLocked.
inode.DropLink()
return inode, nil
diff --git a/pkg/sentry/fs/tty/line_discipline.go b/pkg/sentry/fs/tty/line_discipline.go
index fde4e7941..a3aa95ece 100644
--- a/pkg/sentry/fs/tty/line_discipline.go
+++ b/pkg/sentry/fs/tty/line_discipline.go
@@ -244,8 +244,8 @@ func (l *lineDiscipline) queueWrite(ctx context.Context, src usermem.IOSequence,
return int64(n), err
}
-// transformOutput does ouput processing for one end of the pty. See
-// drivers/tty/n_tty.c:do_output_char for an analagous kernel function.
+// transformOutput does output processing for one end of the pty. See
+// drivers/tty/n_tty.c:do_output_char for an analogous kernel function.
//
// Precondition: l.termiosMu must be held.
func (l *lineDiscipline) transformOutput(buf []byte) *bytes.Buffer {
diff --git a/pkg/sentry/kernel/semaphore/semaphore.go b/pkg/sentry/kernel/semaphore/semaphore.go
index 19ad5d537..fb8c2f98c 100644
--- a/pkg/sentry/kernel/semaphore/semaphore.go
+++ b/pkg/sentry/kernel/semaphore/semaphore.go
@@ -298,7 +298,7 @@ func (s *Set) GetVal(num int32, creds *auth.Credentials) (int16, error) {
}
// ExecuteOps attempts to execute a list of operations to the set. It only
-// suceeds when all operations can be applied. No changes are made if it fails.
+// succeeds when all operations can be applied. No changes are made if it fails.
//
// On failure, it may return an error (retries are hopeless) or it may return
// a channel that can be waited on before attempting again.
diff --git a/pkg/sentry/kernel/task_exit.go b/pkg/sentry/kernel/task_exit.go
index 3d49ae350..d6604f37b 100644
--- a/pkg/sentry/kernel/task_exit.go
+++ b/pkg/sentry/kernel/task_exit.go
@@ -125,7 +125,7 @@ func (t *Task) killLocked() {
Signo: int32(linux.SIGKILL),
// Linux just sets SIGKILL in the pending signal bitmask without
// enqueueing an actual siginfo, such that
- // kernel/signal.c:collect_signal() initalizes si_code to SI_USER.
+ // kernel/signal.c:collect_signal() initializes si_code to SI_USER.
Code: arch.SignalInfoUser,
})
t.interrupt()
diff --git a/pkg/sentry/mm/vma.go b/pkg/sentry/mm/vma.go
index b6af48cb7..61aaa3195 100644
--- a/pkg/sentry/mm/vma.go
+++ b/pkg/sentry/mm/vma.go
@@ -243,7 +243,7 @@ func (mm *MemoryManager) getVMAsLocked(ctx context.Context, ar usermem.AddrRange
}
// getVecVMAsLocked ensures that vmas exist for all addresses in ars, and
-// support access to type of (at, ignorePermissions). It retuns the subset of
+// support access to type of (at, ignorePermissions). It returns the subset of
// ars for which vmas exist. If this is not equal to ars, it returns a non-nil
// error explaining why.
//
diff --git a/pkg/sentry/socket/rpcinet/socket.go b/pkg/sentry/socket/rpcinet/socket.go
index 15047df01..2911d3fd6 100644
--- a/pkg/sentry/socket/rpcinet/socket.go
+++ b/pkg/sentry/socket/rpcinet/socket.go
@@ -530,7 +530,7 @@ func (p *socketProvider) Socket(t *kernel.Task, stypeflags unix.SockType, protoc
// Only accept TCP and UDP.
//
// Try to restrict the flags we will accept to minimize backwards
- // incompatability with netstack.
+ // incompatibility with netstack.
stype := int(stypeflags) & linux.SOCK_TYPE_MASK
switch stype {
case syscall.SOCK_STREAM:
diff --git a/pkg/sentry/strace/syscalls.go b/pkg/sentry/strace/syscalls.go
index d0e661706..eccee733e 100644
--- a/pkg/sentry/strace/syscalls.go
+++ b/pkg/sentry/strace/syscalls.go
@@ -82,7 +82,7 @@ const (
// PipeFDs is an array of two FDs, formatted after syscall execution.
PipeFDs
- // Uname is a pointer to a struct uname, formatted after syscall exection.
+ // Uname is a pointer to a struct uname, formatted after syscall execution.
Uname
// Stat is a pointer to a struct stat, formatted after syscall execution.
diff --git a/pkg/tcpip/header/ipv6.go b/pkg/tcpip/header/ipv6.go
index d8dc138b3..da0210539 100644
--- a/pkg/tcpip/header/ipv6.go
+++ b/pkg/tcpip/header/ipv6.go
@@ -60,7 +60,7 @@ const (
// IPv6ProtocolNumber is IPv6's network protocol number.
IPv6ProtocolNumber tcpip.NetworkProtocolNumber = 0x86dd
- // IPv6Version is the version of the ipv6 procotol.
+ // IPv6Version is the version of the ipv6 protocol.
IPv6Version = 6
// IPv6MinimumMTU is the minimum MTU required by IPv6, per RFC 2460,
diff --git a/pkg/tcpip/stack/stack.go b/pkg/tcpip/stack/stack.go
index b480bf812..f0fbd8aad 100644
--- a/pkg/tcpip/stack/stack.go
+++ b/pkg/tcpip/stack/stack.go
@@ -165,7 +165,7 @@ type TCPSenderState struct {
// window size from a segment.
SndWndScale uint8
- // MaxSentAck is the highest acknowledgemnt number sent till now.
+ // MaxSentAck is the highest acknowledgement number sent till now.
MaxSentAck seqnum.Value
// FastRecovery holds the fast recovery state for the endpoint.
diff --git a/pkg/tcpip/transport/tcp/snd.go b/pkg/tcpip/transport/tcp/snd.go
index ad94aecd8..6c363a929 100644
--- a/pkg/tcpip/transport/tcp/snd.go
+++ b/pkg/tcpip/transport/tcp/snd.go
@@ -152,7 +152,7 @@ func newSender(ep *endpoint, iss, irs seqnum.Value, sndWnd seqnum.Size, mss uint
// updateMaxPayloadSize updates the maximum payload size based on the given
// MTU. If this is in response to "packet too big" control packets (indicated
-// by the count argument), it also reduces the number of oustanding packets and
+// by the count argument), it also reduces the number of outstanding packets and
// attempts to retransmit the first packet above the MTU size.
func (s *sender) updateMaxPayloadSize(mtu, count int) {
m := mtu - header.TCPMinimumSize
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go
index 64810b4ea..954824ada 100644
--- a/runsc/sandbox/sandbox.go
+++ b/runsc/sandbox/sandbox.go
@@ -58,7 +58,7 @@ func validateID(id string) error {
//
// Within a root directory, we maintain subdirectories for each sandbox named
// with the sandbox id. The sandbox metadata is is stored as json within the
-// sandbox directoy in a file named "meta.json". This metadata format is
+// sandbox directory in a file named "meta.json". This metadata format is
// defined by us, and is not part of the OCI spec.
//
// Sandboxes must write this metadata file after any change to their internal
@@ -199,7 +199,7 @@ func Load(rootDir, id string) (*Sandbox, error) {
// If the status is "Running" or "Created", check that the process
// still exists, and set it to Stopped if it does not.
//
- // This is inherintly racey.
+ // This is inherently racey.
if s.Status == Running || s.Status == Created {
// Send signal 0 to check if process exists.
if err := s.Signal(0); err != nil {