diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-02-09 03:23:04 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-09 03:23:04 +0000 |
| commit | b64a1b5924ffd24dd70175529b36bd3674d07efd (patch) | |
| tree | d35c3634d4290393fe68b5f38263042af7d2223f /pkg/sentry/loader | |
| parent | 5741b2ffd9a15af87775038d47667263bb871ca1 (diff) | |
| parent | bf4968e17d7d08299493835a34af1a6d8551c375 (diff) | |
Merge release-20210201.0-59-gbf4968e17 (automated)
Diffstat (limited to 'pkg/sentry/loader')
| -rw-r--r-- | pkg/sentry/loader/elf.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/sentry/loader/elf.go b/pkg/sentry/loader/elf.go index 98af2cc38..cd9fa4031 100644 --- a/pkg/sentry/loader/elf.go +++ b/pkg/sentry/loader/elf.go @@ -517,12 +517,14 @@ func loadParsedELF(ctx context.Context, m *mm.MemoryManager, f fsbridge.File, in start, ok = start.AddLength(uint64(offset)) if !ok { - panic(fmt.Sprintf("Start %#x + offset %#x overflows?", start, offset)) + ctx.Infof(fmt.Sprintf("Start %#x + offset %#x overflows?", start, offset)) + return loadedELF{}, syserror.EINVAL } end, ok = end.AddLength(uint64(offset)) if !ok { - panic(fmt.Sprintf("End %#x + offset %#x overflows?", end, offset)) + ctx.Infof(fmt.Sprintf("End %#x + offset %#x overflows?", end, offset)) + return loadedELF{}, syserror.EINVAL } info.entry, ok = info.entry.AddLength(uint64(offset)) |