diff options
| -rw-r--r-- | pkg/sentry/loader/vdso.go | 6 | ||||
| -rw-r--r-- | runsc/boot/loader.go | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkg/sentry/loader/vdso.go b/pkg/sentry/loader/vdso.go index 037576e41..2e8693f8e 100644 --- a/pkg/sentry/loader/vdso.go +++ b/pkg/sentry/loader/vdso.go @@ -278,12 +278,6 @@ func PrepareVDSO(p platform.Platform) (*VDSO, error) { // // loadVDSO takes a reference on the VDSO and parameter page FrameRegions. func loadVDSO(ctx context.Context, m *mm.MemoryManager, v *VDSO, bin loadedELF) (usermem.Addr, error) { - if v == nil { - // Should be used only by tests. - ctx.Warningf("No VDSO provided, skipping VDSO mapping") - return 0, nil - } - if v.os != bin.os { ctx.Warningf("Binary ELF OS %v and VDSO ELF OS %v differ", bin.os, v.os) return 0, syserror.ENOEXEC diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 6fcfba5cb..a3cc0e4a4 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -134,7 +134,7 @@ func New(spec *specs.Spec, conf *Config, controllerFD, restoreFD int, ioFDs []in // Create VDSO. // // Pass k as the platform since it is savable, unlike the actual platform. - vdso, err := loader.PrepareVDSO(k) + vdso, err = loader.PrepareVDSO(k) if err != nil { return nil, fmt.Errorf("error creating vdso: %v", err) } |