diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-13 18:05:22 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-13 18:05:22 +0000 |
| commit | c2c8729c1838fb30e5cd2a0f2c9689f4abf5b882 (patch) | |
| tree | 7bcb6692bfab3238b4c89b897d777ef3c09cf8e5 /pkg/sentry/arch | |
| parent | 621c6d551f577f98db5d94f4b96e1082c8213533 (diff) | |
| parent | 6a4d17a31dc209afbbca66e871a7c6dc299c167b (diff) | |
Merge release-20200323.0-134-g6a4d17a (automated)
Diffstat (limited to 'pkg/sentry/arch')
| -rw-r--r-- | pkg/sentry/arch/stack.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkg/sentry/arch/stack.go b/pkg/sentry/arch/stack.go index 09bceabc9..1108fa0bd 100644 --- a/pkg/sentry/arch/stack.go +++ b/pkg/sentry/arch/stack.go @@ -97,7 +97,6 @@ func (s *Stack) Push(vals ...interface{}) (usermem.Addr, error) { if c < 0 { return 0, fmt.Errorf("bad binary.Size for %T", v) } - // TODO(b/38173783): Use a real context.Context. n, err := usermem.CopyObjectOut(context.Background(), s.IO, s.Bottom-usermem.Addr(c), norm, usermem.IOOpts{}) if err != nil || c != n { return 0, err @@ -121,11 +120,9 @@ func (s *Stack) Pop(vals ...interface{}) (usermem.Addr, error) { var err error if isVaddr { value := s.Arch.Native(uintptr(0)) - // TODO(b/38173783): Use a real context.Context. n, err = usermem.CopyObjectIn(context.Background(), s.IO, s.Bottom, value, usermem.IOOpts{}) *vaddr = usermem.Addr(s.Arch.Value(value)) } else { - // TODO(b/38173783): Use a real context.Context. n, err = usermem.CopyObjectIn(context.Background(), s.IO, s.Bottom, v, usermem.IOOpts{}) } if err != nil { |