diff options
| author | Mark Wielaard <[email protected]> | 2020-06-09 18:21:36 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2020-06-09 18:21:36 +0200 |
| commit | c0d643e7d91fc002c9fecd83277c62a0e56ef76f (patch) | |
| tree | 89b5cf6673baa2cb206fdf245f4e30fe884945ad /libelf/gelf_getnote.c | |
| parent | 14030673602a4f331f348decd51e5f0160719f0e (diff) | |
| parent | 5643e037cb7a38ed5d52f50421be706ea8014e3d (diff) | |
Merge tag 'elfutils-0.177' into mjw/RH-DTSdts-0.177
elfutils 0.177 release
Conflicts:
libebl/eblopenbackend.c Removed try_dlopen and csky.
tests/run-strip-reloc.sh Removed csky tests.
Diffstat (limited to 'libelf/gelf_getnote.c')
| -rw-r--r-- | libelf/gelf_getnote.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libelf/gelf_getnote.c b/libelf/gelf_getnote.c index 6d33b355..0f7b9d68 100644 --- a/libelf/gelf_getnote.c +++ b/libelf/gelf_getnote.c @@ -80,11 +80,12 @@ gelf_getnote (Elf_Data *data, size_t offset, GElf_Nhdr *result, the offset, after adding the namesz, and include padding in descsz to get to the end. */ *name_offset = offset; - offset += n->n_namesz; - if (offset > data->d_size) + if (n->n_namesz > data->d_size + || offset > data->d_size - n->n_namesz) offset = 0; else { + offset += n->n_namesz; /* Include padding. Check below for overflow. */ GElf_Word descsz = (data->d_type == ELF_T_NHDR8 ? NOTE_ALIGN8 (n->n_descsz) |