diff options
author | Bin Lu <bin.lu@arm.com> | 2020-02-11 02:35:39 -0500 |
---|---|---|
committer | Bin Lu <bin.lu@arm.com> | 2020-04-17 05:07:59 -0400 |
commit | fe001edb14e6e879ab4ebca0d2ac71d770ac8cce (patch) | |
tree | 53af5c22b9522bc5b9643a9ab660ea315c1b7e52 /pkg/sentry/loader/loader.go | |
parent | 0dd9ee0d1e08d4207f78ab032a5fde171343c4b4 (diff) |
Arm64: VDSO support for signal
The vdso is enabled, so we can use the sigreturn trampolines
the vdso provides in arch module.
Signed-off-by: Bin Lu <bin.lu@arm.com>
Diffstat (limited to 'pkg/sentry/loader/loader.go')
-rw-r--r-- | pkg/sentry/loader/loader.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkg/sentry/loader/loader.go b/pkg/sentry/loader/loader.go index 9a613d6b7..57422706d 100644 --- a/pkg/sentry/loader/loader.go +++ b/pkg/sentry/loader/loader.go @@ -392,6 +392,15 @@ func Load(ctx context.Context, args LoadArgs, extraAuxv []arch.AuxEntry, vdso *V m.SetAuxv(auxv) m.SetExecutable(d) + symbolValue, err := getSymbolValueFromVDSO("rt_sigreturn") + if err != nil { + return 0, nil, "", syserr.NewDynamic(fmt.Sprintf("Failed to find rt_sigreturn in vdso: %v", err), syserr.FromError(err).ToLinux()) + } + + // Found rt_sigretrun. + addr := uint64(vdsoAddr) + symbolValue - vdsoPrelink + m.SetVDSOSigReturn(addr) + ac.SetIP(uintptr(loaded.entry)) ac.SetStack(uintptr(stack.Bottom)) |