elfutils/elfutils-robustify.patch

1540 lines
55 KiB
Diff
Raw Normal View History

2005-08-24 22:10:14 +00:00
src/
2005-06-09 Roland McGrath <roland@redhat.com>
* readelf.c (handle_dynamic, handle_symtab): Check for bogus sh_link.
(handle_verneed, handle_verdef, handle_versym, handle_hash): Likewise.
(handle_scngrp): Check for bogus sh_info.
* strip.c (handle_elf): Check for bogus values in sh_link, sh_info,
st_shndx, e_shstrndx, and SHT_GROUP or SHT_SYMTAB_SHNDX data.
Don't use assert on input values, instead bail with "illformed" error.
2005-05-17 Jakub Jelinek <jakub@redhat.com>
libelf/
* elf32_getphdr.c (elfw2(LIBELFBITS,getphdr)): Check if program header
table fits into object's bounds.
* elf_getshstrndx.c (elf_getshstrndx): Add elf->start_offset to
elf->map_address. Check if first section header fits into object's
bounds.
* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Fix comment pasto.
Check if section header table fits into object's bounds.
2005-09-06 03:23:06 +00:00
* elf_begin.c (get_shnum): Ensure section headers fits into
object's bounds.
2005-08-24 22:10:14 +00:00
(file_read_elf): Make sure scncnt is small enough to allocate both
ElfXX_Shdr and Elf_Scn array. Make sure section and program header
tables fit into object's bounds. Avoid memory leak on failure.
src/
* elflint.c (check_hash): Don't check entries beyond end of section.
(check_note): Don't crash if gelf_rawchunk fails.
(section_name): Return <invalid> if gelf_getshdr returns NULL.
2005-05-14 Jakub Jelinek <jakub@redhat.com>
libelf/
* libelfP.h (INVALID_NDX): Define.
* gelf_getdyn.c (gelf_getdyn): Use it. Remove ndx < 0 test if any.
* gelf_getlib.c (gelf_getlib): Likewise.
* gelf_getmove.c (gelf_getmove): Likewise.
* gelf_getrel.c (gelf_getrel): Likewise.
* gelf_getrela.c (gelf_getrela): Likewise.
* gelf_getsym.c (gelf_getsym): Likewise.
* gelf_getsyminfo.c (gelf_getsyminfo): Likewise.
* gelf_getsymshndx.c (gelf_getsymshndx): Likewise.
* gelf_getversym.c (gelf_getversym): Likewise.
* gelf_update_dyn.c (gelf_update_dyn): Likewise.
* gelf_update_lib.c (gelf_update_lib): Likewise.
* gelf_update_move.c (gelf_update_move): Likewise.
* gelf_update_rel.c (gelf_update_rel): Likewise.
* gelf_update_rela.c (gelf_update_rela): Likewise.
* gelf_update_sym.c (gelf_update_sym): Likewise.
* gelf_update_syminfo.c (gelf_update_syminfo): Likewise.
* gelf_update_symshndx.c (gelf_update_symshndx): Likewise.
* gelf_update_versym.c (gelf_update_versym): Likewise.
* elf_newscn.c (elf_newscn): Check for overflow.
* elf32_updatefile.c (__elfw2(LIBELFBITS,updatemmap)): Likewise.
(__elfw2(LIBELFBITS,updatefile)): Likewise.
* elf_begin.c (file_read_elf): Likewise.
* elf32_newphdr.c (elfw2(LIBELFBITS,newphdr)): Likewise.
* elf_getarsym.c (elf_getarsym): Likewise.
* elf32_getshdr.c (elfw2(LIBELFBITS,getshdr)): Likewise.
src/
* elflint.c (section_name): Return "<invalid>" instead of
crashing on invalid section name.
(check_symtab, is_rel_dyn, check_rela, check_rel, check_dynamic,
check_symtab_shndx, check_hash, check_versym): Robustify.
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf32_getphdr.c
+++ elfutils-0.120/libelf/elf32_getphdr.c
@@ -115,6 +115,16 @@ elfw2(LIBELFBITS,getphdr) (elf)
2005-08-24 22:10:14 +00:00
if (elf->map_address != NULL)
{
+ /* First see whether the information in the ELF header is
+ valid and it does not ask for too much. */
+ if (unlikely (ehdr->e_phoff >= elf->maximum_size)
+ || unlikely (ehdr->e_phoff + size > elf->maximum_size))
+ {
+ /* Something is wrong. */
+ __libelf_seterrno (ELF_E_INVALID_PHDR);
+ goto out;
+ }
+
/* All the data is already mapped. Use it. */
if (ehdr->e_ident[EI_DATA] == MY_ELFDATA
&& (ALLOW_UNALIGNED
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf32_getshdr.c
+++ elfutils-0.120/libelf/elf32_getshdr.c
@@ -101,11 +101,12 @@ elfw2(LIBELFBITS,getshdr) (scn)
2005-08-24 22:10:14 +00:00
goto out;
size_t shnum;
- if (INTUSE (elf_getshnum) (elf, &shnum) != 0)
+ if (INTUSE (elf_getshnum) (elf, &shnum) != 0
+ || shnum > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Shdr)))
goto out;
size_t size = shnum * sizeof (ElfW2(LIBELFBITS,Shdr));
- /* Allocate memory for the program headers. We know the number
+ /* Allocate memory for the section headers. We know the number
of entries from the ELF header. */
ElfW2(LIBELFBITS,Shdr) *shdr = elf->state.ELFW(elf,LIBELFBITS).shdr =
(ElfW2(LIBELFBITS,Shdr) *) malloc (size);
2006-04-05 04:49:29 +00:00
@@ -128,6 +129,16 @@ elfw2(LIBELFBITS,getshdr) (scn)
+ ehdr->e_shoff)
2005-08-24 22:10:14 +00:00
& (__alignof__ (ElfW2(LIBELFBITS,Shdr)) - 1)) != 0));
+ /* First see whether the information in the ELF header is
+ valid and it does not ask for too much. */
+ if (unlikely (ehdr->e_shoff >= elf->maximum_size)
+ || unlikely (ehdr->e_shoff + size > elf->maximum_size))
+ {
+ /* Something is wrong. */
+ __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
+ goto free_and_out;
+ }
+
/* Now copy the data and at the same time convert the byte
order. */
if (ALLOW_UNALIGNED
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf32_newphdr.c
+++ elfutils-0.120/libelf/elf32_newphdr.c
@@ -124,6 +124,12 @@ elfw2(LIBELFBITS,newphdr) (elf, count)
2005-08-24 22:10:14 +00:00
else if (elf->state.ELFW(elf,LIBELFBITS).ehdr->e_phnum != count
|| elf->state.ELFW(elf,LIBELFBITS).phdr == NULL)
{
+ if (unlikely (count > SIZE_MAX / sizeof (ElfW2(LIBELFBITS,Phdr))))
+ {
+ result = NULL;
+ goto out;
+ }
+
/* Allocate a new program header with the appropriate number of
elements. */
result = (ElfW2(LIBELFBITS,Phdr) *)
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf32_updatefile.c
+++ elfutils-0.120/libelf/elf32_updatefile.c
@@ -201,6 +201,9 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf
2005-08-24 22:10:14 +00:00
/* Write all the sections. Well, only those which are modified. */
if (shnum > 0)
{
+ if (unlikely (shnum > SIZE_MAX / sizeof (Elf_Scn *)))
2006-04-05 04:49:29 +00:00
+ return 1;
2005-08-24 22:10:14 +00:00
+
Elf_ScnList *list = &elf->state.ELFW(elf,LIBELFBITS).scns;
Elf_Scn **scns = (Elf_Scn **) alloca (shnum * sizeof (Elf_Scn *));
2006-04-05 04:49:29 +00:00
char *const shdr_start = ((char *) elf->map_address + elf->start_offset
@@ -545,6 +548,10 @@ __elfw2(LIBELFBITS,updatefile) (Elf *elf
2005-08-24 22:10:14 +00:00
/* Write all the sections. Well, only those which are modified. */
if (shnum > 0)
{
+ if (unlikely (shnum > SIZE_MAX / (sizeof (Elf_Scn *)
+ + sizeof (ElfW2(LIBELFBITS,Shdr)))))
+ return 1;
+
off_t shdr_offset = elf->start_offset + ehdr->e_shoff;
#if EV_NUM != 2
xfct_t shdr_fctp = __elf_xfctstom[__libelf_version - 1][EV_CURRENT - 1][ELFW(ELFCLASS, LIBELFBITS) - 1][ELF_T_SHDR];
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf_begin.c
+++ elfutils-0.120/libelf/elf_begin.c
@@ -155,7 +155,8 @@ get_shnum (void *map_address, unsigned c
2005-08-24 22:10:14 +00:00
if (unlikely (result == 0) && ehdr.e32->e_shoff != 0)
{
- if (offset + ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize)
+ if (unlikely (ehdr.e32->e_shoff >= maxsize)
+ || unlikely (ehdr.e32->e_shoff + sizeof (Elf32_Shdr) > maxsize))
/* Cannot read the first section header. */
return (size_t) -1l;
2006-04-05 04:49:29 +00:00
@@ -198,7 +199,8 @@ get_shnum (void *map_address, unsigned c
2005-08-24 22:10:14 +00:00
if (unlikely (result == 0) && ehdr.e64->e_shoff != 0)
{
- if (offset + ehdr.e64->e_shoff + sizeof (Elf64_Shdr) > maxsize)
+ if (unlikely (ehdr.e64->e_shoff >= maxsize)
+ || unlikely (ehdr.e64->e_shoff + sizeof (Elf64_Shdr) > maxsize))
/* Cannot read the first section header. */
return (size_t) -1l;
2006-04-05 04:49:29 +00:00
@@ -265,6 +267,15 @@ file_read_elf (int fildes, void *map_add
2005-08-24 22:10:14 +00:00
/* Could not determine the number of sections. */
return NULL;
+ /* Check for too many sections. */
+ if (e_ident[EI_CLASS] == ELFCLASS32)
+ {
+ if (scncnt > SIZE_MAX / (sizeof (Elf_Scn) + sizeof (Elf32_Shdr)))
+ return NULL;
+ }
+ else if (scncnt > SIZE_MAX / (sizeof (Elf_Scn) + sizeof (Elf64_Shdr)))
+ return NULL;
+
/* We can now allocate the memory. */
2005-09-06 03:23:06 +00:00
Elf *elf = allocate_elf (fildes, map_address, offset, maxsize, cmd, parent,
ELF_K_ELF, scncnt * sizeof (Elf_Scn));
2006-04-05 04:49:29 +00:00
@@ -298,13 +309,31 @@ file_read_elf (int fildes, void *map_add
2005-09-06 03:23:06 +00:00
{
2005-08-24 22:10:14 +00:00
/* We can use the mmapped memory. */
2005-09-06 03:23:06 +00:00
elf->state.elf32.ehdr = ehdr;
+
+ if (unlikely (ehdr->e_shoff >= maxsize)
+ || unlikely (ehdr->e_shoff
2005-08-24 22:10:14 +00:00
+ + scncnt * sizeof (Elf32_Shdr) > maxsize))
+ {
+ free_and_out:
+ free (elf);
2005-09-06 03:23:06 +00:00
+ __libelf_seterrno (ELF_E_INVALID_FILE);
2005-08-24 22:10:14 +00:00
+ return NULL;
+ }
2005-09-06 03:23:06 +00:00
elf->state.elf32.shdr
= (Elf32_Shdr *) ((char *) ehdr + ehdr->e_shoff);
+
if (ehdr->e_phnum > 0)
2005-08-24 22:10:14 +00:00
- /* Assign a value only if there really is a program
- header. Otherwise the value remains NULL. */
- elf->state.elf32.phdr
2005-09-06 03:23:06 +00:00
- = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
2005-08-24 22:10:14 +00:00
+ {
+ /* Assign a value only if there really is a program
+ header. Otherwise the value remains NULL. */
2005-09-06 03:23:06 +00:00
+ if (unlikely (ehdr->e_phoff >= maxsize)
+ || unlikely (ehdr->e_phoff
+ + ehdr->e_phnum
2005-08-24 22:10:14 +00:00
+ * sizeof (Elf32_Phdr) > maxsize))
+ goto free_and_out;
+ elf->state.elf32.phdr
2005-09-06 03:23:06 +00:00
+ = (Elf32_Phdr *) ((char *) ehdr + ehdr->e_phoff);
2005-08-24 22:10:14 +00:00
+ }
for (size_t cnt = 0; cnt < scncnt; ++cnt)
{
2006-04-05 04:49:29 +00:00
@@ -373,13 +402,26 @@ file_read_elf (int fildes, void *map_add
2005-09-06 03:23:06 +00:00
{
2005-08-24 22:10:14 +00:00
/* We can use the mmapped memory. */
2005-09-06 03:23:06 +00:00
elf->state.elf64.ehdr = ehdr;
+
+ if (unlikely (ehdr->e_shoff >= maxsize)
+ || unlikely (ehdr->e_shoff
+ + scncnt * sizeof (Elf32_Shdr) > maxsize))
2005-08-24 22:10:14 +00:00
+ goto free_and_out;
2005-09-06 03:23:06 +00:00
elf->state.elf64.shdr
= (Elf64_Shdr *) ((char *) ehdr + ehdr->e_shoff);
+
if (ehdr->e_phnum > 0)
2005-08-24 22:10:14 +00:00
- /* Assign a value only if there really is a program
- header. Otherwise the value remains NULL. */
- elf->state.elf64.phdr
2005-09-06 03:23:06 +00:00
- = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff);
2005-08-24 22:10:14 +00:00
+ {
+ /* Assign a value only if there really is a program
+ header. Otherwise the value remains NULL. */
2005-09-06 03:23:06 +00:00
+ if (unlikely (ehdr->e_phoff >= maxsize)
+ || unlikely (ehdr->e_phoff
+ + ehdr->e_phnum
+ * sizeof (Elf32_Phdr) > maxsize))
2005-08-24 22:10:14 +00:00
+ goto free_and_out;
+ elf->state.elf64.phdr
2005-09-06 03:23:06 +00:00
+ = (Elf64_Phdr *) ((char *) ehdr + ehdr->e_phoff);
2005-08-24 22:10:14 +00:00
+ }
for (size_t cnt = 0; cnt < scncnt; ++cnt)
{
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf_getarsym.c
+++ elfutils-0.120/libelf/elf_getarsym.c
@@ -179,6 +179,9 @@ elf_getarsym (elf, ptr)
2005-08-24 22:10:14 +00:00
size_t index_size = atol (tmpbuf);
if (SARMAG + sizeof (struct ar_hdr) + index_size > elf->maximum_size
+#if SIZE_MAX <= 4294967295U
+ || n >= SIZE_MAX / sizeof (Elf_Arsym)
+#endif
|| n * sizeof (uint32_t) > index_size)
{
/* This index table cannot be right since it does not fit into
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf_getshstrndx.c
+++ elfutils-0.120/libelf/elf_getshstrndx.c
@@ -125,10 +125,25 @@ elf_getshstrndx (elf, dst)
2005-08-24 22:10:14 +00:00
if (elf->map_address != NULL
&& elf->state.elf32.ehdr->e_ident[EI_DATA] == MY_ELFDATA
&& (ALLOW_UNALIGNED
- || (((size_t) ((char *) elf->map_address + offset))
+ || (((size_t) ((char *) elf->map_address
+ + elf->start_offset + offset))
& (__alignof__ (Elf32_Shdr) - 1)) == 0))
- /* We can directly access the memory. */
- num = ((Elf32_Shdr *) (elf->map_address + offset))->sh_link;
+ {
+ /* First see whether the information in the ELF header is
+ valid and it does not ask for too much. */
+ if (unlikely (offset + sizeof (Elf32_Shdr)
+ > elf->maximum_size))
+ {
+ /* Something is wrong. */
+ __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
+ result = -1;
+ goto out;
+ }
+
+ /* We can directly access the memory. */
+ num = ((Elf32_Shdr *) (elf->map_address + elf->start_offset
2005-09-06 03:23:06 +00:00
+ + offset))->sh_link;
2005-08-24 22:10:14 +00:00
+ }
else
{
/* We avoid reading in all the section headers. Just read
2006-04-05 04:49:29 +00:00
@@ -163,10 +178,25 @@ elf_getshstrndx (elf, dst)
2005-08-24 22:10:14 +00:00
if (elf->map_address != NULL
&& elf->state.elf64.ehdr->e_ident[EI_DATA] == MY_ELFDATA
&& (ALLOW_UNALIGNED
- || (((size_t) ((char *) elf->map_address + offset))
+ || (((size_t) ((char *) elf->map_address
+ + elf->start_offset + offset))
& (__alignof__ (Elf64_Shdr) - 1)) == 0))
- /* We can directly access the memory. */
- num = ((Elf64_Shdr *) (elf->map_address + offset))->sh_link;
+ {
+ /* First see whether the information in the ELF header is
+ valid and it does not ask for too much. */
+ if (unlikely (offset + sizeof (Elf64_Shdr)
+ > elf->maximum_size))
+ {
+ /* Something is wrong. */
+ __libelf_seterrno (ELF_E_INVALID_SECTION_HEADER);
+ result = -1;
+ goto out;
+ }
+
+ /* We can directly access the memory. */
+ num = ((Elf64_Shdr *) (elf->map_address
+ + elf->start_offset + offset))->sh_link;
+ }
else
{
/* We avoid reading in all the section headers. Just read
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/elf_newscn.c
+++ elfutils-0.120/libelf/elf_newscn.c
@@ -104,13 +104,21 @@ elf_newscn (elf)
2005-08-24 22:10:14 +00:00
else
{
/* We must allocate a new element. */
- Elf_ScnList *newp;
+ Elf_ScnList *newp = NULL;
assert (elf->state.elf.scnincr > 0);
- newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
- + ((elf->state.elf.scnincr *= 2)
- * sizeof (Elf_Scn)), 1);
+ if (
+#if SIZE_MAX <= 4294967295U
+ likely (elf->state.elf.scnincr
+ < SIZE_MAX / 2 / sizeof (Elf_Scn) - sizeof (Elf_ScnList))
+#else
+ 1
+#endif
+ )
+ newp = (Elf_ScnList *) calloc (sizeof (Elf_ScnList)
+ + ((elf->state.elf.scnincr *= 2)
+ * sizeof (Elf_Scn)), 1);
if (newp == NULL)
{
__libelf_seterrno (ELF_E_NOMEM);
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getdyn.c
+++ elfutils-0.120/libelf/gelf_getdyn.c
@@ -93,7 +93,8 @@ gelf_getdyn (data, ndx, dst)
2005-08-24 22:10:14 +00:00
table entries has to be adopted. The user better has provided
a buffer where we can store the information. While copying the
data we are converting the format. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Dyn)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -114,7 +115,8 @@ gelf_getdyn (data, ndx, dst)
2005-08-24 22:10:14 +00:00
/* The data is already in the correct form. Just make sure the
index is OK. */
- if (unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, GElf_Dyn)
+ || unlikely ((ndx + 1) * sizeof (GElf_Dyn) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getlib.c
+++ elfutils-0.120/libelf/gelf_getlib.c
@@ -86,7 +86,8 @@ gelf_getlib (data, ndx, dst)
2005-08-24 22:10:14 +00:00
/* The data is already in the correct form. Just make sure the
index is OK. */
GElf_Lib *result = NULL;
- if (unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
+ if (INVALID_NDX (ndx, GElf_Lib)
+ || unlikely ((ndx + 1) * sizeof (GElf_Lib) > data->d_size))
__libelf_seterrno (ELF_E_INVALID_INDEX);
else
{
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getmove.c
+++ elfutils-0.120/libelf/gelf_getmove.c
@@ -83,7 +83,8 @@ gelf_getmove (data, ndx, dst)
2005-08-24 22:10:14 +00:00
/* The data is already in the correct form. Just make sure the
index is OK. */
- if (unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
+ if (INVALID_NDX (ndx, GElf_Move)
+ || unlikely ((ndx + 1) * sizeof (GElf_Move) > data->d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getrela.c
+++ elfutils-0.120/libelf/gelf_getrela.c
@@ -71,12 +71,6 @@ gelf_getrela (data, ndx, dst)
2005-08-24 22:10:14 +00:00
if (data_scn == NULL)
return NULL;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return NULL;
- }
-
if (unlikely (data_scn->d.d_type != ELF_T_RELA))
{
__libelf_seterrno (ELF_E_INVALID_HANDLE);
2006-04-05 04:49:29 +00:00
@@ -93,7 +87,8 @@ gelf_getrela (data, ndx, dst)
2005-08-24 22:10:14 +00:00
if (scn->elf->class == ELFCLASS32)
{
/* We have to convert the data. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Rela)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
result = NULL;
2006-04-05 04:49:29 +00:00
@@ -114,7 +109,8 @@ gelf_getrela (data, ndx, dst)
2005-08-24 22:10:14 +00:00
{
/* Simply copy the data after we made sure we are actually getting
correct data. */
- if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Rela)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
result = NULL;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getrel.c
+++ elfutils-0.120/libelf/gelf_getrel.c
@@ -71,12 +71,6 @@ gelf_getrel (data, ndx, dst)
2005-08-24 22:10:14 +00:00
if (data_scn == NULL)
return NULL;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return NULL;
- }
-
if (unlikely (data_scn->d.d_type != ELF_T_REL))
{
__libelf_seterrno (ELF_E_INVALID_HANDLE);
2006-04-05 04:49:29 +00:00
@@ -93,7 +87,8 @@ gelf_getrel (data, ndx, dst)
2005-08-24 22:10:14 +00:00
if (scn->elf->class == ELFCLASS32)
{
/* We have to convert the data. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Rel)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
result = NULL;
2006-04-05 04:49:29 +00:00
@@ -113,7 +108,8 @@ gelf_getrel (data, ndx, dst)
2005-08-24 22:10:14 +00:00
{
/* Simply copy the data after we made sure we are actually getting
correct data. */
- if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Rel)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
result = NULL;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getsym.c
+++ elfutils-0.120/libelf/gelf_getsym.c
@@ -90,7 +90,8 @@ gelf_getsym (data, ndx, dst)
2005-08-24 22:10:14 +00:00
table entries has to be adopted. The user better has provided
a buffer where we can store the information. While copying the
data we are converting the format. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
+ if (INVALID_NDX (ndx, Elf32_Sym)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data->d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -119,7 +120,8 @@ gelf_getsym (data, ndx, dst)
2005-08-24 22:10:14 +00:00
/* The data is already in the correct form. Just make sure the
index is OK. */
- if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
+ if (INVALID_NDX (ndx, GElf_Sym)
+ || unlikely ((ndx + 1) * sizeof (GElf_Sym) > data->d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getsyminfo.c
+++ elfutils-0.120/libelf/gelf_getsyminfo.c
@@ -84,7 +84,8 @@ gelf_getsyminfo (data, ndx, dst)
2005-08-24 22:10:14 +00:00
/* The data is already in the correct form. Just make sure the
index is OK. */
- if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
+ if (INVALID_NDX (ndx, GElf_Syminfo)
+ || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data->d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getsymshndx.c
+++ elfutils-0.120/libelf/gelf_getsymshndx.c
@@ -90,7 +90,9 @@ gelf_getsymshndx (symdata, shndxdata, nd
2005-08-24 22:10:14 +00:00
section index table. */
if (likely (shndxdata_scn != NULL))
{
- if (unlikely ((ndx + 1) * sizeof (Elf32_Word) > shndxdata_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Word)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Word)
+ > shndxdata_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -110,7 +112,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
2005-08-24 22:10:14 +00:00
table entries has to be adopted. The user better has provided
a buffer where we can store the information. While copying the
data we are converting the format. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
+ if (INVALID_NDX (ndx, Elf32_Sym)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata->d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -139,7 +142,8 @@ gelf_getsymshndx (symdata, shndxdata, nd
2005-08-24 22:10:14 +00:00
/* The data is already in the correct form. Just make sure the
index is OK. */
- if (unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
+ if (INVALID_NDX (ndx, GElf_Sym)
+ || unlikely ((ndx + 1) * sizeof (GElf_Sym) > symdata->d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_getversym.c
+++ elfutils-0.120/libelf/gelf_getversym.c
@@ -92,7 +92,8 @@ gelf_getversym (data, ndx, dst)
2005-08-24 22:10:14 +00:00
/* The data is already in the correct form. Just make sure the
index is OK. */
- if (unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
+ if (INVALID_NDX (ndx, GElf_Versym)
+ || unlikely ((ndx + 1) * sizeof (GElf_Versym) > data->d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
result = NULL;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_dyn.c
+++ elfutils-0.120/libelf/gelf_update_dyn.c
@@ -71,12 +71,6 @@ gelf_update_dyn (data, ndx, src)
2005-08-24 22:10:14 +00:00
if (data == NULL)
return 0;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return 0;
- }
-
if (unlikely (data_scn->d.d_type != ELF_T_DYN))
{
/* The type of the data better should match. */
2006-04-05 04:49:29 +00:00
@@ -102,7 +96,8 @@ gelf_update_dyn (data, ndx, src)
2005-08-24 22:10:14 +00:00
}
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Dyn)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Dyn) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -116,7 +111,8 @@ gelf_update_dyn (data, ndx, src)
2005-08-24 22:10:14 +00:00
else
{
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Dyn)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Dyn) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_lib.c
+++ elfutils-0.120/libelf/gelf_update_lib.c
@@ -68,12 +68,6 @@ gelf_update_lib (data, ndx, src)
2005-08-24 22:10:14 +00:00
if (data == NULL)
return 0;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return 0;
- }
-
Elf_Data_Scn *data_scn = (Elf_Data_Scn *) data;
if (unlikely (data_scn->d.d_type != ELF_T_LIB))
{
2006-04-05 04:49:29 +00:00
@@ -87,7 +81,8 @@ gelf_update_lib (data, ndx, src)
2005-08-24 22:10:14 +00:00
/* Check whether we have to resize the data buffer. */
int result = 0;
- if (unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Lib)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Lib) > data_scn->d.d_size))
__libelf_seterrno (ELF_E_INVALID_INDEX);
else
{
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_move.c
+++ elfutils-0.120/libelf/gelf_update_move.c
@@ -75,7 +75,7 @@ gelf_update_move (data, ndx, src)
2005-08-24 22:10:14 +00:00
assert (sizeof (GElf_Move) == sizeof (Elf64_Move));
/* Check whether we have to resize the data buffer. */
- if (unlikely (ndx < 0)
+ if (INVALID_NDX (ndx, GElf_Move)
|| unlikely ((ndx + 1) * sizeof (GElf_Move) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_rela.c
+++ elfutils-0.120/libelf/gelf_update_rela.c
@@ -68,12 +68,6 @@ gelf_update_rela (Elf_Data *dst, int ndx
2005-08-24 22:10:14 +00:00
if (dst == NULL)
return 0;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return 0;
- }
-
if (unlikely (data_scn->d.d_type != ELF_T_RELA))
{
/* The type of the data better should match. */
2006-04-05 04:49:29 +00:00
@@ -101,7 +95,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
2005-08-24 22:10:14 +00:00
}
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Rela)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Rela) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -117,7 +112,8 @@ gelf_update_rela (Elf_Data *dst, int ndx
2005-08-24 22:10:14 +00:00
else
{
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Rela)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Rela) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_rel.c
+++ elfutils-0.120/libelf/gelf_update_rel.c
@@ -68,12 +68,6 @@ gelf_update_rel (Elf_Data *dst, int ndx,
2005-08-24 22:10:14 +00:00
if (dst == NULL)
return 0;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return 0;
- }
-
if (unlikely (data_scn->d.d_type != ELF_T_REL))
{
/* The type of the data better should match. */
2006-04-05 04:49:29 +00:00
@@ -99,7 +93,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
2005-08-24 22:10:14 +00:00
}
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Rel)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Rel) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -114,7 +109,8 @@ gelf_update_rel (Elf_Data *dst, int ndx,
2005-08-24 22:10:14 +00:00
else
{
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Rel)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Rel) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_sym.c
+++ elfutils-0.120/libelf/gelf_update_sym.c
@@ -72,12 +72,6 @@ gelf_update_sym (data, ndx, src)
2005-08-24 22:10:14 +00:00
if (data == NULL)
return 0;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return 0;
- }
-
if (unlikely (data_scn->d.d_type != ELF_T_SYM))
{
/* The type of the data better should match. */
2006-04-05 04:49:29 +00:00
@@ -102,7 +96,8 @@ gelf_update_sym (data, ndx, src)
2005-08-24 22:10:14 +00:00
}
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Sym)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -125,7 +120,8 @@ gelf_update_sym (data, ndx, src)
2005-08-24 22:10:14 +00:00
else
{
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Sym)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_syminfo.c
+++ elfutils-0.120/libelf/gelf_update_syminfo.c
@@ -72,12 +72,6 @@ gelf_update_syminfo (data, ndx, src)
2005-08-24 22:10:14 +00:00
if (data == NULL)
return 0;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return 0;
- }
-
if (unlikely (data_scn->d.d_type != ELF_T_SYMINFO))
{
/* The type of the data better should match. */
2006-04-05 04:49:29 +00:00
@@ -93,7 +87,8 @@ gelf_update_syminfo (data, ndx, src)
2005-08-24 22:10:14 +00:00
rwlock_wrlock (scn->elf->lock);
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
+ if (INVALID_NDX (ndx, GElf_Syminfo)
+ || unlikely ((ndx + 1) * sizeof (GElf_Syminfo) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_symshndx.c
+++ elfutils-0.120/libelf/gelf_update_symshndx.c
@@ -77,12 +77,6 @@ gelf_update_symshndx (symdata, shndxdata
2005-08-24 22:10:14 +00:00
if (symdata == NULL)
return 0;
- if (unlikely (ndx < 0))
- {
- __libelf_seterrno (ELF_E_INVALID_INDEX);
- return 0;
- }
-
if (unlikely (symdata_scn->d.d_type != ELF_T_SYM))
{
/* The type of the data better should match. */
2006-04-05 04:49:29 +00:00
@@ -128,7 +122,8 @@ gelf_update_symshndx (symdata, shndxdata
2005-08-24 22:10:14 +00:00
}
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf32_Sym)
+ || unlikely ((ndx + 1) * sizeof (Elf32_Sym) > symdata_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
@@ -151,7 +146,8 @@ gelf_update_symshndx (symdata, shndxdata
2005-08-24 22:10:14 +00:00
else
{
/* Check whether we have to resize the data buffer. */
- if (unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
+ if (INVALID_NDX (ndx, Elf64_Sym)
+ || unlikely ((ndx + 1) * sizeof (Elf64_Sym) > symdata_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
goto out;
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/gelf_update_versym.c
+++ elfutils-0.120/libelf/gelf_update_versym.c
@@ -75,7 +75,7 @@ gelf_update_versym (data, ndx, src)
2005-08-24 22:10:14 +00:00
assert (sizeof (GElf_Versym) == sizeof (Elf64_Versym));
/* Check whether we have to resize the data buffer. */
- if (unlikely (ndx < 0)
+ if (INVALID_NDX (ndx, GElf_Versym)
|| unlikely ((ndx + 1) * sizeof (GElf_Versym) > data_scn->d.d_size))
{
__libelf_seterrno (ELF_E_INVALID_INDEX);
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/libelf/libelfP.h
+++ elfutils-0.120/libelf/libelfP.h
@@ -569,4 +569,13 @@ extern uint32_t __libelf_crc32 (uint32_t
2005-08-24 22:10:14 +00:00
} while (0)
#endif
+/* Convenience macro. Assumes int NDX and TYPE with size at least
+ 2 bytes. */
+#if SIZE_MAX > 4294967295U
+# define INVALID_NDX(ndx, type) unlikely (ndx < 0)
+#else
+# define INVALID_NDX(ndx, type) \
+ unlikely ((unsigned int) (ndx) >= SIZE_MAX / sizeof (type))
+#endif
+
#endif /* libelfP.h */
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/src/elflint.c
+++ elfutils-0.120/src/elflint.c
@@ -123,6 +123,9 @@ static uint32_t shstrndx;
2005-08-24 22:10:14 +00:00
/* Array to count references in section groups. */
static int *scnref;
+/* Number of sections. */
+static unsigned int shnum;
+
int
main (int argc, char *argv[])
2006-04-05 04:49:29 +00:00
@@ -312,10 +315,19 @@ section_name (Ebl *ebl, int idx)
2005-08-24 22:10:14 +00:00
{
GElf_Shdr shdr_mem;
GElf_Shdr *shdr;
+ const char *ret;
+
+ if ((unsigned int) idx > shnum)
+ return "<invalid>";
shdr = gelf_getshdr (elf_getscn (ebl->elf, idx), &shdr_mem);
+ if (shdr == NULL)
+ return "<invalid>";
- return elf_strptr (ebl->elf, shstrndx, shdr->sh_name);
+ ret = elf_strptr (ebl->elf, shstrndx, shdr->sh_name);
+ if (ret == NULL)
+ return "<invalid>";
+ return ret;
}
2006-04-05 04:49:29 +00:00
@@ -337,10 +349,6 @@ static const int valid_e_machine[] =
2005-08-24 22:10:14 +00:00
(sizeof (valid_e_machine) / sizeof (valid_e_machine[0]))
-/* Number of sections. */
-static unsigned int shnum;
-
-
static void
check_elf_header (Ebl *ebl, GElf_Ehdr *ehdr, size_t size)
{
2006-04-05 04:49:29 +00:00
@@ -603,7 +611,8 @@ section [%2d] '%s': symbol table cannot
2005-08-24 22:10:14 +00:00
}
}
- if (shdr->sh_entsize != gelf_fsize (ebl->elf, ELF_T_SYM, 1, EV_CURRENT))
+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_SYM, 1, EV_CURRENT);
+ if (shdr->sh_entsize != sh_entsize)
ERROR (gettext ("\
section [%2zu] '%s': entry size is does not match ElfXX_Sym\n"),
cnt, section_name (ebl, cnt));
2006-04-05 04:49:29 +00:00
@@ -641,7 +650,7 @@ section [%2d] '%s': XINDEX for zeroth en
2005-08-24 22:10:14 +00:00
xndxscnidx, section_name (ebl, xndxscnidx));
}
- for (cnt = 1; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
+ for (cnt = 1; cnt < shdr->sh_size / sh_entsize; ++cnt)
{
sym = gelf_getsymshndx (data, xndxdata, cnt, &sym_mem, &xndx);
if (sym == NULL)
2006-04-05 04:49:29 +00:00
@@ -659,7 +668,8 @@ section [%2d] '%s': symbol %zu: invalid
2005-08-24 22:10:14 +00:00
else
{
name = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name);
- assert (name != NULL);
+ assert (name != NULL
+ || strshdr->sh_type != SHT_STRTAB);
}
if (sym->st_shndx == SHN_XINDEX)
2006-04-05 04:49:29 +00:00
@@ -970,7 +980,7 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
2005-08-24 22:10:14 +00:00
const GElf_Shdr *rcshdr = gelf_getshdr (scn, &rcshdr_mem);
assert (rcshdr != NULL);
- if (rcshdr->sh_type == SHT_DYNAMIC)
+ if (rcshdr->sh_type == SHT_DYNAMIC && rcshdr->sh_entsize)
{
/* Found the dynamic section. Look through it. */
Elf_Data *d = elf_getdata (scn, NULL);
2006-04-05 04:49:29 +00:00
@@ -980,14 +990,17 @@ is_rel_dyn (Ebl *ebl, const GElf_Ehdr *e
2005-08-24 22:10:14 +00:00
{
GElf_Dyn dyn_mem;
GElf_Dyn *dyn = gelf_getdyn (d, cnt, &dyn_mem);
- assert (dyn != NULL);
+
+ if (dyn == NULL)
+ break;
if (dyn->d_tag == DT_RELCOUNT)
{
/* Found it. One last check: does the number
specified number of relative relocations exceed
the total number of relocations? */
- if (dyn->d_un.d_val > shdr->sh_size / shdr->sh_entsize)
+ if (shdr->sh_entsize
+ && dyn->d_un.d_val > shdr->sh_size / shdr->sh_entsize)
ERROR (gettext ("\
section [%2d] '%s': DT_RELCOUNT value %d too high for this section\n"),
idx, section_name (ebl, idx),
2006-04-05 04:49:29 +00:00
@@ -1062,7 +1075,8 @@ section [%2d] '%s': no relocations for m
2005-08-24 22:10:14 +00:00
}
}
- if (shdr->sh_entsize != gelf_fsize (ebl->elf, reltype, 1, EV_CURRENT))
+ size_t sh_entsize = gelf_fsize (ebl->elf, reltype, 1, EV_CURRENT);
+ if (shdr->sh_entsize != sh_entsize)
ERROR (gettext (reltype == ELF_T_RELA ? "\
section [%2d] '%s': section entry size does not match ElfXX_Rela\n" : "\
section [%2d] '%s': section entry size does not match ElfXX_Rel\n"),
2006-04-05 04:49:29 +00:00
@@ -1280,7 +1294,8 @@ check_rela (Ebl *ebl, GElf_Ehdr *ehdr, G
2005-08-24 22:10:14 +00:00
Elf_Data *symdata = elf_getdata (symscn, NULL);
enum load_state state = state_undecided;
- for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_RELA, 1, EV_CURRENT);
+ for (size_t cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt)
{
GElf_Rela rela_mem;
GElf_Rela *rela = gelf_getrela (data, cnt, &rela_mem);
2006-04-05 04:49:29 +00:00
@@ -1330,7 +1345,8 @@ check_rel (Ebl *ebl, GElf_Ehdr *ehdr, GE
2005-08-24 22:10:14 +00:00
Elf_Data *symdata = elf_getdata (symscn, NULL);
enum load_state state = state_undecided;
- for (size_t cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_REL, 1, EV_CURRENT);
+ for (size_t cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt)
{
GElf_Rel rel_mem;
GElf_Rel *rel = gelf_getrel (data, cnt, &rel_mem);
2006-04-05 04:49:29 +00:00
@@ -1432,7 +1448,8 @@ section [%2d] '%s': referenced as string
2005-08-24 22:10:14 +00:00
shdr->sh_link, section_name (ebl, shdr->sh_link),
idx, section_name (ebl, idx));
- if (shdr->sh_entsize != gelf_fsize (ebl->elf, ELF_T_DYN, 1, EV_CURRENT))
+ size_t sh_entsize = gelf_fsize (ebl->elf, ELF_T_DYN, 1, EV_CURRENT);
+ if (shdr->sh_entsize != sh_entsize)
ERROR (gettext ("\
section [%2d] '%s': section entry size does not match ElfXX_Dyn\n"),
idx, section_name (ebl, idx));
2006-04-05 04:49:29 +00:00
@@ -1442,7 +1459,7 @@ section [%2d] '%s': section entry size d
2005-08-24 22:10:14 +00:00
idx, section_name (ebl, idx));
bool non_null_warned = false;
- for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
+ for (cnt = 0; cnt < shdr->sh_size / sh_entsize; ++cnt)
{
GElf_Dyn dyn_mem;
GElf_Dyn *dyn = gelf_getdyn (data, cnt, &dyn_mem);
2006-04-05 04:49:29 +00:00
@@ -1633,6 +1650,8 @@ section [%2d] '%s': entry size does not
2005-08-24 22:10:14 +00:00
idx, section_name (ebl, idx));
if (symshdr != NULL
+ && shdr->sh_entsize
+ && symshdr->sh_entsize
&& (shdr->sh_size / shdr->sh_entsize
< symshdr->sh_size / symshdr->sh_entsize))
ERROR (gettext ("\
2006-04-05 04:49:29 +00:00
@@ -1659,6 +1678,12 @@ section [%2d] '%s': extended section ind
2005-08-24 22:10:14 +00:00
}
Elf_Data *data = elf_getdata (elf_getscn (ebl->elf, idx), NULL);
+ if (data == NULL)
+ {
+ ERROR (gettext ("section [%2d] '%s': cannot get section data\n"),
+ idx, section_name (ebl, idx));
+ return;
+ }
if (*((Elf32_Word *) data->d_buf) != 0)
ERROR (gettext ("symbol 0 should have zero extended section index\n"));
2006-04-05 04:49:29 +00:00
@@ -1739,23 +1764,30 @@ section [%2d] '%s': hash table section i
2005-08-24 22:10:14 +00:00
idx, section_name (ebl, idx), (long int) shdr->sh_size,
(long int) ((2 + nbucket + nchain) * shdr->sh_entsize));
- if (symshdr != NULL)
+ if (symshdr != NULL && symshdr->sh_entsize)
{
size_t symsize = symshdr->sh_size / symshdr->sh_entsize;
size_t cnt;
+ Elf32_Word *buf, *end;
if (nchain < symshdr->sh_size / symshdr->sh_entsize)
ERROR (gettext ("section [%2d] '%s': chain array not large enough\n"),
idx, section_name (ebl, idx));
+ buf = ((Elf32_Word *) data->d_buf) + 2;
+ end = (Elf32_Word *) ((char *) data->d_buf + shdr->sh_size);
for (cnt = 2; cnt < 2 + nbucket; ++cnt)
- if (((Elf32_Word *) data->d_buf)[cnt] >= symsize)
+ if (buf >= end)
+ return;
+ else if (*buf++ >= symsize)
ERROR (gettext ("\
section [%2d] '%s': hash bucket reference %zu out of bounds\n"),
idx, section_name (ebl, idx), cnt - 2);
for (; cnt < 2 + nbucket + nchain; ++cnt)
- if (((Elf32_Word *) data->d_buf)[cnt] >= symsize)
+ if (buf >= end)
+ return;
+ else if (*buf++ >= symsize)
ERROR (gettext ("\
section [%2d] '%s': hash chain reference %zu out of bounds\n"),
idx, section_name (ebl, idx), cnt - 2 - nbucket);
2006-04-05 04:49:29 +00:00
@@ -2097,8 +2129,9 @@ section [%2d] '%s' refers in sh_link to
2005-08-24 22:10:14 +00:00
/* The number of elements in the version symbol table must be the
same as the number of symbols. */
- if (shdr->sh_size / shdr->sh_entsize
- != symshdr->sh_size / symshdr->sh_entsize)
+ if (shdr->sh_entsize && symshdr->sh_entsize
+ && (shdr->sh_size / shdr->sh_entsize
+ != symshdr->sh_size / symshdr->sh_entsize))
ERROR (gettext ("\
section [%2d] '%s' has different number of entries than symbol table [%2d] '%s'\n"),
idx, section_name (ebl, idx),
2006-04-05 04:49:29 +00:00
@@ -3002,6 +3035,8 @@ phdr[%d]: no note entries defined for th
2005-08-24 22:10:14 +00:00
return;
char *notemem = gelf_rawchunk (ebl->elf, phdr->p_offset, phdr->p_filesz);
+ if (notemem == NULL)
+ return;
/* ELF64 files often use note section entries in the 32-bit format.
The p_align field is set to 8 in case the 64-bit format is used.
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/src/readelf.c
+++ elfutils-0.120/src/readelf.c
@@ -958,6 +958,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
2005-10-31 20:58:56 +00:00
Elf32_Word *grpref = (Elf32_Word *) data->d_buf;
2005-08-24 22:10:14 +00:00
2005-10-31 20:58:56 +00:00
GElf_Sym sym_mem;
+ GElf_Sym *sym = gelf_getsym (symdata, shdr->sh_info, &sym_mem);
2005-08-24 22:10:14 +00:00
+
printf ((grpref[0] & GRP_COMDAT)
2005-10-31 20:58:56 +00:00
? ngettext ("\
\nCOMDAT section group [%2zu] '%s' with signature '%s' contains %zu entry:\n",
2006-04-05 04:49:29 +00:00
@@ -970,8 +972,8 @@ handle_scngrp (Ebl *ebl, Elf_Scn *scn, G
2005-08-24 22:10:14 +00:00
data->d_size / sizeof (Elf32_Word) - 1),
elf_ndxscn (scn),
elf_strptr (ebl->elf, shstrndx, shdr->sh_name),
- elf_strptr (ebl->elf, symshdr->sh_link,
- gelf_getsym (symdata, shdr->sh_info, &sym_mem)->st_name)
+ (sym == NULL ? NULL
+ : elf_strptr (ebl->elf, symshdr->sh_link, sym->st_name))
?: gettext ("<INVALID SYMBOL>"),
data->d_size / sizeof (Elf32_Word) - 1);
2006-04-05 04:49:29 +00:00
@@ -1122,7 +1124,8 @@ static void
2005-08-24 22:10:14 +00:00
handle_dynamic (Ebl *ebl, Elf_Scn *scn, GElf_Shdr *shdr)
{
int class = gelf_getclass (ebl->elf);
- GElf_Shdr glink;
+ GElf_Shdr glink_mem;
+ GElf_Shdr *glink;
Elf_Data *data;
size_t cnt;
size_t shstrndx;
2006-04-05 04:49:29 +00:00
@@ -1137,6 +1140,11 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
2005-08-24 22:10:14 +00:00
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
+ glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem);
+ if (glink == NULL)
+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
+ elf_ndxscn (scn));
+
printf (ngettext ("\
\nDynamic segment contains %lu entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
2006-04-05 04:49:29 +00:00
@@ -1146,9 +1154,7 @@ handle_dynamic (Ebl *ebl, Elf_Scn *scn,
2005-08-24 22:10:14 +00:00
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(int) shdr->sh_link,
- elf_strptr (ebl->elf, shstrndx,
- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
- &glink)->sh_name));
+ elf_strptr (ebl->elf, shstrndx, glink->sh_name));
fputs_unlocked (gettext (" Type Value\n"), stdout);
for (cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
2006-04-05 04:49:29 +00:00
@@ -1666,6 +1672,13 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
2005-08-24 22:10:14 +00:00
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
2005-10-31 20:58:56 +00:00
+ GElf_Shdr glink_mem;
+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
+ &glink_mem);
2005-08-24 22:10:14 +00:00
+ if (glink == NULL)
+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
+ elf_ndxscn (scn));
+
/* Now we can compute the number of entries in the section. */
2005-10-31 20:58:56 +00:00
unsigned int nsyms = data->d_size / (class == ELFCLASS32
? sizeof (Elf32_Sym)
2006-04-05 04:49:29 +00:00
@@ -1676,15 +1689,12 @@ handle_symtab (Ebl *ebl, Elf_Scn *scn, G
2005-10-31 20:58:56 +00:00
nsyms),
(unsigned int) elf_ndxscn (scn),
elf_strptr (ebl->elf, shstrndx, shdr->sh_name), nsyms);
- GElf_Shdr glink;
printf (ngettext (" %lu local symbol String table: [%2u] '%s'\n",
" %lu local symbols String table: [%2u] '%s'\n",
2005-08-24 22:10:14 +00:00
shdr->sh_info),
(unsigned long int) shdr->sh_info,
(unsigned int) shdr->sh_link,
- elf_strptr (ebl->elf, shstrndx,
- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
- &glink)->sh_name));
+ elf_strptr (ebl->elf, shstrndx, glink->sh_name));
fputs_unlocked (class == ELFCLASS32
? gettext ("\
2006-04-05 04:49:29 +00:00
@@ -1920,7 +1930,13 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
2005-08-24 22:10:14 +00:00
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
- GElf_Shdr glink;
+ GElf_Shdr glink_mem;
+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
+ &glink_mem);
+ if (glink == NULL)
+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
+ elf_ndxscn (scn));
+
printf (ngettext ("\
\nVersion needs section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
2006-04-05 04:49:29 +00:00
@@ -1931,9 +1947,7 @@ handle_verneed (Ebl *ebl, Elf_Scn *scn,
2005-08-24 22:10:14 +00:00
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
- elf_strptr (ebl->elf, shstrndx,
- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
- &glink)->sh_name));
+ elf_strptr (ebl->elf, shstrndx, glink->sh_name));
unsigned int offset = 0;
for (int cnt = shdr->sh_info; --cnt >= 0; )
2006-04-05 04:49:29 +00:00
@@ -1986,8 +2000,14 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
2005-08-24 22:10:14 +00:00
error (EXIT_FAILURE, 0,
gettext ("cannot get section header string table index"));
+ GElf_Shdr glink_mem;
+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
+ &glink_mem);
+ if (glink == NULL)
+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
+ elf_ndxscn (scn));
+
int class = gelf_getclass (ebl->elf);
- GElf_Shdr glink;
printf (ngettext ("\
\nVersion definition section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
2006-04-05 04:49:29 +00:00
@@ -1999,9 +2019,7 @@ handle_verdef (Ebl *ebl, Elf_Scn *scn, G
2005-08-24 22:10:14 +00:00
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
- elf_strptr (ebl->elf, shstrndx,
- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
- &glink)->sh_name));
+ elf_strptr (ebl->elf, shstrndx, glink->sh_name));
unsigned int offset = 0;
for (int cnt = shdr->sh_info; --cnt >= 0; )
2006-04-05 04:49:29 +00:00
@@ -2263,8 +2281,14 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
2005-08-24 22:10:14 +00:00
filename = NULL;
}
+ GElf_Shdr glink_mem;
+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
+ &glink_mem);
+ if (glink == NULL)
+ error (EXIT_FAILURE, 0, gettext ("invalid sh_link value in section %Zu"),
+ elf_ndxscn (scn));
+
/* Print the header. */
2005-10-31 20:58:56 +00:00
- GElf_Shdr glink;
2005-08-24 22:10:14 +00:00
printf (ngettext ("\
\nVersion symbols section [%2u] '%s' contains %d entry:\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'",
2005-10-31 20:58:56 +00:00
"\
2006-04-05 04:49:29 +00:00
@@ -2276,9 +2300,7 @@ handle_versym (Ebl *ebl, Elf_Scn *scn, G
2005-08-24 22:10:14 +00:00
class == ELFCLASS32 ? 10 : 18, shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
- elf_strptr (ebl->elf, shstrndx,
- gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link),
- &glink)->sh_name));
+ elf_strptr (ebl->elf, shstrndx, glink->sh_name));
/* Now we can finally look at the actual contents of this section. */
for (unsigned int cnt = 0; cnt < shdr->sh_size / shdr->sh_entsize; ++cnt)
2006-04-05 04:49:29 +00:00
@@ -2353,7 +2375,17 @@ handle_hash (Ebl *ebl)
2005-10-31 20:58:56 +00:00
Elf32_Word *bucket = &((Elf32_Word *) data->d_buf)[2];
Elf32_Word *chain = &((Elf32_Word *) data->d_buf)[2 + nbucket];
2005-08-24 22:10:14 +00:00
2005-10-31 20:58:56 +00:00
- GElf_Shdr glink;
+ GElf_Shdr glink_mem;
+ GElf_Shdr *glink = gelf_getshdr (elf_getscn (ebl->elf,
+ shdr->sh_link),
+ &glink_mem);
+ if (glink == NULL)
+ {
+ error (0, 0, gettext ("invalid sh_link value in section %Zu"),
+ elf_ndxscn (scn));
+ continue;
+ }
2005-08-24 22:10:14 +00:00
+
2005-10-31 20:58:56 +00:00
printf (ngettext ("\
\nHistogram for bucket list length in section [%2u] '%s' (total of %d bucket):\n Addr: %#0*" PRIx64 " Offset: %#08" PRIx64 " Link to section: [%2u] '%s'\n",
"\
2006-04-05 04:49:29 +00:00
@@ -2366,10 +2398,7 @@ handle_hash (Ebl *ebl)
2005-08-24 22:10:14 +00:00
shdr->sh_addr,
shdr->sh_offset,
(unsigned int) shdr->sh_link,
- elf_strptr (ebl->elf, shstrndx,
- gelf_getshdr (elf_getscn (ebl->elf,
- shdr->sh_link),
- &glink)->sh_name));
+ elf_strptr (ebl->elf, shstrndx, glink->sh_name));
2005-10-31 20:58:56 +00:00
uint32_t *lengths = (uint32_t *) xcalloc (nbucket,
sizeof (uint32_t));
2006-04-05 04:49:29 +00:00
@@ -3510,6 +3539,16 @@ print_debug_aranges_section (Ebl *ebl __
2005-08-24 22:10:14 +00:00
return;
}
+ GElf_Shdr glink_mem;
+ GElf_Shdr *glink;
+ glink = gelf_getshdr (elf_getscn (ebl->elf, shdr->sh_link), &glink_mem);
+ if (glink == NULL)
+ {
+ error (0, 0, gettext ("invalid sh_link value in section %Zu"),
+ elf_ndxscn (scn));
+ return;
+ }
+
printf (ngettext ("\
\nDWARF section '%s' at offset %#" PRIx64 " contains %zu entry:\n",
"\
2006-04-05 04:49:29 +00:00
--- elfutils-0.120/src/strip.c
+++ elfutils-0.120/src/strip.c
@@ -412,6 +412,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
Elf_Data debuglink_crc_data;
bool any_symtab_changes = false;
Elf_Data *shstrtab_data = NULL;
+ size_t shdridx = 0;
/* Create the full name of the file. */
if (prefix != NULL)
2006-04-05 04:49:29 +00:00
@@ -542,6 +543,11 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
goto fail_close;
}
+ if (shstrndx >= shnum)
+ goto illformed;
+
+#define elf_assert(test) do { if (!(test)) goto illformed; } while (0)
+
/* Storage for section information. We leave room for two more
entries since we unconditionally create a section header string
table. Maybe some weird tool created an ELF file without one.
2006-04-05 04:49:29 +00:00
@@ -563,7 +569,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
{
/* This should always be true (i.e., there should not be any
holes in the numbering). */
- assert (elf_ndxscn (scn) == cnt);
+ elf_assert (elf_ndxscn (scn) == cnt);
shdr_info[cnt].scn = scn;
2006-04-05 04:49:29 +00:00
@@ -576,6 +582,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
shdr_info[cnt].shdr.sh_name);
if (shdr_info[cnt].name == NULL)
{
+ illformed:
error (0, 0, gettext ("illformed file '%s'"), fname);
goto fail_close;
}
2006-04-05 04:49:29 +00:00
@@ -585,6 +592,8 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
/* Remember the shdr.sh_link value. */
shdr_info[cnt].old_sh_link = shdr_info[cnt].shdr.sh_link;
+ if (shdr_info[cnt].old_sh_link >= shnum)
+ goto illformed;
/* Sections in files other than relocatable object files which
are not loaded can be freely moved by us. In relocatable
2006-04-05 04:49:29 +00:00
@@ -597,7 +606,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
appropriate reference. */
if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB_SHNDX))
{
- assert (shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx == 0);
+ elf_assert (shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx == 0);
shdr_info[shdr_info[cnt].shdr.sh_link].symtab_idx = cnt;
}
else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GROUP))
2006-04-05 04:49:29 +00:00
@@ -614,7 +623,12 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
for (inner = 1;
inner < shdr_info[cnt].data->d_size / sizeof (Elf32_Word);
++inner)
- shdr_info[grpref[inner]].group_idx = cnt;
+ {
+ if (grpref[inner] < shnum)
+ shdr_info[grpref[inner]].group_idx = cnt;
+ else
+ goto illformed;
+ }
if (inner == 1 || (inner == 2 && (grpref[0] & GRP_COMDAT) == 0))
/* If the section group contains only one element and this
2006-04-05 04:49:29 +00:00
@@ -625,7 +639,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
}
else if (unlikely (shdr_info[cnt].shdr.sh_type == SHT_GNU_versym))
{
- assert (shdr_info[shdr_info[cnt].shdr.sh_link].version_idx == 0);
+ elf_assert (shdr_info[shdr_info[cnt].shdr.sh_link].version_idx == 0);
shdr_info[shdr_info[cnt].shdr.sh_link].version_idx = cnt;
}
2006-04-05 04:49:29 +00:00
@@ -633,7 +647,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
discarded right away. */
if ((shdr_info[cnt].shdr.sh_flags & SHF_GROUP) != 0)
{
- assert (shdr_info[cnt].group_idx != 0);
+ elf_assert (shdr_info[cnt].group_idx != 0);
if (shdr_info[shdr_info[cnt].group_idx].idx == 0)
{
2006-04-05 04:49:29 +00:00
@@ -708,10 +722,14 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
{
/* If a relocation section is marked as being removed make
sure the section it is relocating is removed, too. */
- if ((shdr_info[cnt].shdr.sh_type == SHT_REL
- || shdr_info[cnt].shdr.sh_type == SHT_RELA)
- && shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0)
- shdr_info[cnt].idx = 1;
+ if (shdr_info[cnt].shdr.sh_type == SHT_REL
+ || shdr_info[cnt].shdr.sh_type == SHT_RELA)
+ {
+ if (shdr_info[cnt].shdr.sh_info >= shnum)
+ goto illformed;
+ else if (shdr_info[shdr_info[cnt].shdr.sh_info].idx != 0)
+ shdr_info[cnt].idx = 1;
+ }
}
if (shdr_info[cnt].idx == 1)
2006-04-05 04:49:29 +00:00
@@ -737,7 +755,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
if (shdr_info[cnt].symtab_idx != 0
&& shdr_info[shdr_info[cnt].symtab_idx].data == NULL)
{
- assert (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB);
+ elf_assert (shdr_info[cnt].shdr.sh_type == SHT_SYMTAB);
shdr_info[shdr_info[cnt].symtab_idx].data
= elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
2006-04-05 04:49:29 +00:00
@@ -777,6 +795,9 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
else if (scnidx == SHN_XINDEX)
scnidx = xndx;
+ if (scnidx >= shnum)
+ goto illformed;
+
if (shdr_info[scnidx].idx == 0)
{
/* Mark this section as used. */
2006-04-05 04:49:29 +00:00
@@ -808,11 +829,15 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
}
/* Handle references through sh_info. */
- if (SH_INFO_LINK_P (&shdr_info[cnt].shdr)
- && shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0)
+ if (SH_INFO_LINK_P (&shdr_info[cnt].shdr))
{
- shdr_info[shdr_info[cnt].shdr.sh_info].idx = 1;
- changes |= shdr_info[cnt].shdr.sh_info < cnt;
+ if (shdr_info[cnt].shdr.sh_info >= shnum)
+ goto illformed;
+ else if ( shdr_info[shdr_info[cnt].shdr.sh_info].idx == 0)
+ {
+ shdr_info[shdr_info[cnt].shdr.sh_info].idx = 1;
+ changes |= shdr_info[cnt].shdr.sh_info < cnt;
+ }
}
/* Mark the section as investigated. */
2006-04-05 04:49:29 +00:00
@@ -912,7 +937,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
error (EXIT_FAILURE, 0, gettext ("while generating output file: %s"),
elf_errmsg (-1));
- assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);
+ elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);
/* Add this name to the section header string table. */
shdr_info[cnt].se = ebl_strtabadd (shst, shdr_info[cnt].name, 0);
2006-04-05 04:49:29 +00:00
@@ -949,7 +974,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
error (EXIT_FAILURE, 0,
gettext ("while create section header section: %s"),
elf_errmsg (-1));
- assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);
+ elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == shdr_info[cnt].idx);
shdr_info[cnt].data = elf_newdata (shdr_info[cnt].newscn);
if (shdr_info[cnt].data == NULL)
2006-04-05 04:49:29 +00:00
@@ -980,7 +1005,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
}
/* Index of the section header table in the shdr_info array. */
- size_t shdridx = cnt;
+ shdridx = cnt;
/* Add the section header string table section name. */
shdr_info[cnt].se = ebl_strtabadd (shst, ".shstrtab", 10);
2006-04-05 04:49:29 +00:00
@@ -1005,7 +1030,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
error (EXIT_FAILURE, 0,
gettext ("while create section header section: %s"),
elf_errmsg (-1));
- assert (elf_ndxscn (shdr_info[cnt].newscn) == idx);
+ elf_assert (elf_ndxscn (shdr_info[cnt].newscn) == idx);
/* Finalize the string table and fill in the correct indices in the
section headers. */
2006-04-05 04:49:29 +00:00
@@ -1095,21 +1120,21 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn,
NULL);
- assert ((versiondata->d_size / sizeof (Elf32_Word))
- >= shdr_info[cnt].data->d_size / elsize);
+ elf_assert ((versiondata->d_size / sizeof (Elf32_Word))
+ >= shdr_info[cnt].data->d_size / elsize);
}
if (shdr_info[cnt].version_idx != 0)
{
- assert (shdr_info[cnt].shdr.sh_type == SHT_DYNSYM);
+ elf_assert (shdr_info[cnt].shdr.sh_type == SHT_DYNSYM);
/* This section has associated version
information. We have to modify that
information, too. */
versiondata = elf_getdata (shdr_info[shdr_info[cnt].version_idx].scn,
NULL);
- assert ((versiondata->d_size / sizeof (GElf_Versym))
- >= shdr_info[cnt].data->d_size / elsize);
+ elf_assert ((versiondata->d_size / sizeof (GElf_Versym))
+ >= shdr_info[cnt].data->d_size / elsize);
}
shdr_info[cnt].newsymidx
2006-04-05 04:49:29 +00:00
@@ -1163,7 +1188,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
sec = shdr_info[sym->st_shndx].idx;
else
{
- assert (shndxdata != NULL);
+ elf_assert (shndxdata != NULL);
sec = shdr_info[xshndx].idx;
}
2006-04-05 04:49:29 +00:00
@@ -1184,7 +1209,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
nxshndx = sec;
}
- assert (sec < SHN_LORESERVE || shndxdata != NULL);
+ elf_assert (sec < SHN_LORESERVE || shndxdata != NULL);
if ((inner != destidx || nshndx != sym->st_shndx
|| (shndxdata != NULL && nxshndx != xshndx))
2006-04-05 04:49:29 +00:00
@@ -1207,7 +1232,7 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
else
/* This is a section symbol for a section which has
been removed. */
- assert (GELF_ST_TYPE (sym->st_info) == STT_SECTION);
+ elf_assert (GELF_ST_TYPE (sym->st_info) == STT_SECTION);
}
if (destidx != inner)
2006-04-05 04:49:29 +00:00
@@ -1371,11 +1396,11 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
{
GElf_Sym sym_mem;
GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
- assert (sym != NULL);
+ elf_assert (sym != NULL);
const char *name = elf_strptr (elf, strshndx,
sym->st_name);
- assert (name != NULL);
+ elf_assert (name != NULL);
size_t hidx = elf_hash (name) % nbucket;
if (bucket[hidx] == 0)
2006-04-05 04:49:29 +00:00
@@ -1394,8 +1419,8 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
else
{
/* Alpha and S390 64-bit use 64-bit SHT_HASH entries. */
- assert (shdr_info[cnt].shdr.sh_entsize
- == sizeof (Elf64_Xword));
+ elf_assert (shdr_info[cnt].shdr.sh_entsize
+ == sizeof (Elf64_Xword));
Elf64_Xword *bucket = (Elf64_Xword *) hashd->d_buf;
2006-04-05 04:49:29 +00:00
@@ -1428,11 +1453,11 @@ handle_elf (int fd, Elf *elf, const char
2005-08-24 22:10:14 +00:00
{
GElf_Sym sym_mem;
GElf_Sym *sym = gelf_getsym (symd, inner, &sym_mem);
- assert (sym != NULL);
+ elf_assert (sym != NULL);
const char *name = elf_strptr (elf, strshndx,
sym->st_name);
- assert (name != NULL);
+ elf_assert (name != NULL);
size_t hidx = elf_hash (name) % nbucket;
if (bucket[hidx] == 0)