diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-07-24 08:22:20 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-07-24 08:22:20 +0000 |
commit | 3819bc2bc1bb5a56c957db01c6104d96d2ab9707 (patch) | |
tree | 0032ace986d40fa3dde98f66f3b8f43c341d8acb /pkg/sentry | |
parent | 137a239f8e1bba9121225550b1684f421a5369db (diff) | |
parent | c59b792f53f3aa4c24d1ca9442ffc44f6d4932df (diff) |
Merge release-20200622.1-216-gc59b792f5 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r-- | pkg/sentry/arch/arch_abi_autogen_unsafe.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/sentry/arch/arch_abi_autogen_unsafe.go b/pkg/sentry/arch/arch_abi_autogen_unsafe.go index 98cc11f75..26572d6a6 100644 --- a/pkg/sentry/arch/arch_abi_autogen_unsafe.go +++ b/pkg/sentry/arch/arch_abi_autogen_unsafe.go @@ -63,6 +63,7 @@ func (s *SignalAct) MarshalUnsafe(dst []byte) { if s.Mask.Packed() { safecopy.CopyIn(dst, unsafe.Pointer(s)) } else { + // Type SignalAct doesn't have a packed layout in memory, fallback to MarshalBytes. s.MarshalBytes(dst) } } @@ -72,6 +73,7 @@ func (s *SignalAct) UnmarshalUnsafe(src []byte) { if s.Mask.Packed() { safecopy.CopyOut(unsafe.Pointer(s), src) } else { + // Type SignalAct doesn't have a packed layout in memory, fallback to UnmarshalBytes. s.UnmarshalBytes(src) } } |