diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-16 03:10:09 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-16 03:10:09 +0000 |
| commit | c91c8fb48be452a8b40b3ef406bd8b0022359399 (patch) | |
| tree | af7d6820964c8f8fa680e5acbffebabb0c35c471 /pkg/sentry/socket | |
| parent | 314aa01198a8aa1ceefde004b7ec4fbf86bdedc5 (diff) | |
| parent | 420b791a3d6e0e6e2fc30c6f8be013bce7ca6549 (diff) | |
Merge release-20200511.0-251-g420b791 (automated)
Diffstat (limited to 'pkg/sentry/socket')
| -rwxr-xr-x | pkg/sentry/socket/netstack/netstack.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/socket/netstack/netstack.go b/pkg/sentry/socket/netstack/netstack.go index 9dea2b5ff..60df51dae 100755 --- a/pkg/sentry/socket/netstack/netstack.go +++ b/pkg/sentry/socket/netstack/netstack.go @@ -2718,7 +2718,7 @@ func (s *socketOpsCommon) ioctl(ctx context.Context, io usermem.IO, args arch.Sy v = math.MaxInt32 } - // Copy result to user-space. + // Copy result to userspace. _, err := usermem.CopyObjectOut(ctx, io, args[2].Pointer(), int32(v), usermem.IOOpts{ AddressSpaceActive: true, }) @@ -2787,7 +2787,7 @@ func Ioctl(ctx context.Context, ep commonEndpoint, io usermem.IO, args arch.Sysc if v > math.MaxInt32 { v = math.MaxInt32 } - // Copy result to user-space. + // Copy result to userspace. _, err := usermem.CopyObjectOut(ctx, io, args[2].Pointer(), int32(v), usermem.IOOpts{ AddressSpaceActive: true, }) @@ -2803,7 +2803,7 @@ func Ioctl(ctx context.Context, ep commonEndpoint, io usermem.IO, args arch.Sysc v = math.MaxInt32 } - // Copy result to user-space. + // Copy result to userspace. _, err := usermem.CopyObjectOut(ctx, io, args[2].Pointer(), int32(v), usermem.IOOpts{ AddressSpaceActive: true, }) |