diff options
| author | Haibo Xu <haibo.xu@arm.com> | 2019-11-11 09:42:04 +0000 |
|---|---|---|
| committer | Haibo Xu <haibo.xu@arm.com> | 2019-11-13 06:46:02 +0000 |
| commit | 1d8b7292d72ce93d465e4ded19237fb92c08bc56 (patch) | |
| tree | 46cf4ff31b5d29c92aad69a3261516211f4010b2 | |
| parent | c5d9b5b8816e99507661e1d39ec51033fb69e212 (diff) | |
Fix some build errors on arm64.
Initialize the VDSO "os" and "arch" fields explicitly,
or the VDSO load process would failed on arm64 platform.
Signed-off-by: Haibo Xu <haibo.xu@arm.com>
Change-Id: Ic6768df88e43cd7c7956eb630511672ae11ac52f
| -rw-r--r-- | pkg/sentry/kernel/ptrace_arm64.go | 1 | ||||
| -rw-r--r-- | pkg/sentry/loader/vdso.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/ptrace_arm64.go b/pkg/sentry/kernel/ptrace_arm64.go index 0acdf769d..61e412911 100644 --- a/pkg/sentry/kernel/ptrace_arm64.go +++ b/pkg/sentry/kernel/ptrace_arm64.go @@ -17,7 +17,6 @@ package kernel import ( - "gvisor.dev/gvisor/pkg/abi/linux" "gvisor.dev/gvisor/pkg/sentry/usermem" "gvisor.dev/gvisor/pkg/syserror" ) diff --git a/pkg/sentry/loader/vdso.go b/pkg/sentry/loader/vdso.go index ada28aea3..df8a81907 100644 --- a/pkg/sentry/loader/vdso.go +++ b/pkg/sentry/loader/vdso.go @@ -268,6 +268,8 @@ func PrepareVDSO(ctx context.Context, mfp pgalloc.MemoryFileProvider) (*VDSO, er // some applications may not be able to handle multiple [vdso] // hints. vdso: mm.NewSpecialMappable("", mfp, vdso), + os: info.os, + arch: info.arch, phdrs: info.phdrs, }, nil } |