diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-27 02:11:44 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-27 02:11:44 +0000 |
| commit | 934a1c32824f8e442640948d5907d5ad3a65215a (patch) | |
| tree | 31702c7a5e7b16aae094dcb9e24e76bb18ace1cb /pkg/abi | |
| parent | 5bc6da314faf3f81b3bf089bb0d269dd642e40eb (diff) | |
| parent | 66d1665441461a5226ba0c884e22888d58f393b6 (diff) | |
Merge release-20200622.1-34-g66d166544 (automated)
Diffstat (limited to 'pkg/abi')
| -rw-r--r-- | pkg/abi/linux/linux_abi_autogen_unsafe.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go index ac656f14c..285e270b7 100644 --- a/pkg/abi/linux/linux_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go @@ -178,7 +178,7 @@ func (s *Statx) CopyOut(task marshal.Task, addr usermem.Addr) (int, error) { // CopyIn implements marshal.Marshallable.CopyIn. //go:nosplit func (s *Statx) CopyIn(task marshal.Task, addr usermem.Addr) (int, error) { - if !s.Atime.Packed() && s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() { + if !s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() && s.Atime.Packed() { // Type Statx doesn't have a packed layout in memory, fall back to UnmarshalBytes. buf := task.CopyScratchBuffer(s.SizeBytes()) // escapes: okay. length, err := task.CopyInBytes(addr, buf) // escapes: okay. |