d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gelf_getphdr: Allow extended indices

Browse Source 
Needed for 'readelf -l' of extended phnum files.  (Parity with GNU
binutils.)

Reviewed by:	no one, unfortunately
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D8703
This commit is contained in:
Conrad Meyer 2016-12-16 01:42:51 +00:00
parent 1d1bfbbb38
commit 93326017f6
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/elftoolchain/libelf/gelf_phdr.c
View File

@ -53,10 +53,17 @@ gelf_getphdr(Elf *e, int index, GElf_Phdr *d)
Elf64_Ehdr *eh64; Elf64_Ehdr *eh64;
Elf32_Phdr *ep32; Elf32_Phdr *ep32;
Elf64_Phdr *ep64; Elf64_Phdr *ep64;
size_t phnum;
if (d == NULL || e == NULL || if (d == NULL || e == NULL ||
((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64) || ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64) ||
(e->e_kind != ELF_K_ELF) || index < 0) { (e->e_kind != ELF_K_ELF) || index < 0 ||
elf_getphdrnum(e, &phnum) < 0) {
LIBELF_SET_ERROR(ARGUMENT, 0);
return (NULL);
}
if ((size_t)index >= phnum) {
LIBELF_SET_ERROR(ARGUMENT, 0); LIBELF_SET_ERROR(ARGUMENT, 0);
return (NULL); return (NULL);
} }
@ -66,11 +73,6 @@ gelf_getphdr(Elf *e, int index, GElf_Phdr *d)
((ep32 = _libelf_getphdr(e, ELFCLASS32)) == NULL)) ((ep32 = _libelf_getphdr(e, ELFCLASS32)) == NULL))
return (NULL); return (NULL);
if (index >= eh32->e_phnum) {
LIBELF_SET_ERROR(ARGUMENT, 0);
return (NULL);
}
ep32 += index; ep32 += index;
d->p_type = ep32->p_type; d->p_type = ep32->p_type;
@ -87,11 +89,6 @@ gelf_getphdr(Elf *e, int index, GElf_Phdr *d)
(ep64 = _libelf_getphdr(e, ELFCLASS64)) == NULL) (ep64 = _libelf_getphdr(e, ELFCLASS64)) == NULL)
return (NULL); return (NULL);
if (index >= eh64->e_phnum) {
LIBELF_SET_ERROR(ARGUMENT, 0);
return (NULL);
}
ep64 += index; ep64 += index;
*d = *ep64; *d = *ep64;
@ -125,13 +122,15 @@ gelf_newphdr(Elf *e, size_t count)
int int
gelf_update_phdr(Elf *e, int ndx, GElf_Phdr *s) gelf_update_phdr(Elf *e, int ndx, GElf_Phdr *s)
{ {
int ec, phnum; int ec;
size_t phnum;
void *ehdr; void *ehdr;
Elf32_Phdr *ph32; Elf32_Phdr *ph32;
Elf64_Phdr *ph64; Elf64_Phdr *ph64;
if (s == NULL || e == NULL || e->e_kind != ELF_K_ELF || if (s == NULL || e == NULL || e->e_kind != ELF_K_ELF ||
((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64)) { ((ec = e->e_class) != ELFCLASS32 && ec != ELFCLASS64) ||
elf_getphdrnum(e, &phnum) < 0) {
LIBELF_SET_ERROR(ARGUMENT, 0); LIBELF_SET_ERROR(ARGUMENT, 0);
return (0); return (0);
} }
@ -144,12 +143,7 @@ gelf_update_phdr(Elf *e, int ndx, GElf_Phdr *s)
if ((ehdr = _libelf_ehdr(e, ec, 0)) == NULL) if ((ehdr = _libelf_ehdr(e, ec, 0)) == NULL)
return (0); return (0);
if (ec == ELFCLASS32) if (ndx < 0 || (size_t)ndx > phnum) {
phnum = ((Elf32_Ehdr *) ehdr)->e_phnum;
else
phnum = ((Elf64_Ehdr *) ehdr)->e_phnum;
if (ndx < 0 || ndx > phnum) {
LIBELF_SET_ERROR(ARGUMENT, 0); LIBELF_SET_ERROR(ARGUMENT, 0);
return (0); return (0);
} }