diff options
| author | Andrei Vagin <avagin@google.com> | 2021-02-08 19:15:45 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-02-08 19:18:03 -0800 |
| commit | bf4968e17d7d08299493835a34af1a6d8551c375 (patch) | |
| tree | 6c5e9228abf2ee41a058c69528f2876ea7934129 /pkg/sentry/loader | |
| parent | 39251f31cb92d6c2b053416d04e195e290b106f2 (diff) | |
exec: don't panic if an elf file is malformed
Reported-by: syzbot+d54bc27a15aefe52c330@syzkaller.appspotmail.com
PiperOrigin-RevId: 356406975
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)) |