diff options
Diffstat (limited to 'rtemstoolkit/elftoolchain/libelf/gelf_sym.c')
| -rw-r--r-- | rtemstoolkit/elftoolchain/libelf/gelf_sym.c | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/rtemstoolkit/elftoolchain/libelf/gelf_sym.c b/rtemstoolkit/elftoolchain/libelf/gelf_sym.c index 3f84a17..ecd85fc 100644 --- a/rtemstoolkit/elftoolchain/libelf/gelf_sym.c +++ b/rtemstoolkit/elftoolchain/libelf/gelf_sym.c @@ -24,25 +24,28 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - #include <assert.h> #include <gelf.h> +#include <limits.h> +#include <stdint.h> #include "_libelf.h" -LIBELF_VCSID("$Id: gelf_sym.c 189 2008-07-20 10:38:08Z jkoshy $"); +ELFTC_VCSID("$Id: gelf_sym.c 3177 2015-03-30 18:19:41Z emaste $"); GElf_Sym * -gelf_getsym(Elf_Data *d, int ndx, GElf_Sym *dst) +gelf_getsym(Elf_Data *ed, int ndx, GElf_Sym *dst) { int ec; Elf *e; + size_t msz; Elf_Scn *scn; + uint32_t sh_type; Elf32_Sym *sym32; Elf64_Sym *sym64; - size_t msz; - uint32_t sh_type; + struct _Libelf_Data *d; + + d = (struct _Libelf_Data *) ed; if (d == NULL || ndx < 0 || dst == NULL || (scn = d->d_scn) == NULL || @@ -67,26 +70,24 @@ gelf_getsym(Elf_Data *d, int ndx, GElf_Sym *dst) msz = _libelf_msize(ELF_T_SYM, ec, e->e_version); assert(msz > 0); + assert(ndx >= 0); - if (msz * ndx >= d->d_size) { + if (msz * (size_t) ndx >= d->d_data.d_size) { LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); } if (ec == ELFCLASS32) { - - sym32 = (Elf32_Sym *) d->d_buf + ndx; + sym32 = (Elf32_Sym *) d->d_data.d_buf + ndx; dst->st_name = sym32->st_name; dst->st_value = (Elf64_Addr) sym32->st_value; dst->st_size = (Elf64_Xword) sym32->st_size; - dst->st_info = ELF64_ST_INFO(ELF32_ST_BIND(sym32->st_info), - ELF32_ST_TYPE(sym32->st_info)); + dst->st_info = sym32->st_info; dst->st_other = sym32->st_other; dst->st_shndx = sym32->st_shndx; } else { - - sym64 = (Elf64_Sym *) d->d_buf + ndx; + sym64 = (Elf64_Sym *) d->d_data.d_buf + ndx; *dst = *sym64; } @@ -95,15 +96,18 @@ gelf_getsym(Elf_Data *d, int ndx, GElf_Sym *dst) } int -gelf_update_sym(Elf_Data *d, int ndx, GElf_Sym *gs) +gelf_update_sym(Elf_Data *ed, int ndx, GElf_Sym *gs) { int ec; Elf *e; + size_t msz; Elf_Scn *scn; + uint32_t sh_type; Elf32_Sym *sym32; Elf64_Sym *sym64; - size_t msz; - uint32_t sh_type; + struct _Libelf_Data *d; + + d = (struct _Libelf_Data *) ed; if (d == NULL || ndx < 0 || gs == NULL || (scn = d->d_scn) == NULL || @@ -126,15 +130,17 @@ gelf_update_sym(Elf_Data *d, int ndx, GElf_Sym *gs) } msz = _libelf_msize(ELF_T_SYM, ec, e->e_version); + assert(msz > 0); + assert(ndx >= 0); - if (msz * ndx >= d->d_size) { + if (msz * (size_t) ndx >= d->d_data.d_size) { LIBELF_SET_ERROR(ARGUMENT, 0); return (0); } if (ec == ELFCLASS32) { - sym32 = (Elf32_Sym *) d->d_buf + ndx; + sym32 = (Elf32_Sym *) d->d_data.d_buf + ndx; sym32->st_name = gs->st_name; sym32->st_info = gs->st_info; @@ -144,7 +150,7 @@ gelf_update_sym(Elf_Data *d, int ndx, GElf_Sym *gs) LIBELF_COPY_U32(sym32, gs, st_value); LIBELF_COPY_U32(sym32, gs, st_size); } else { - sym64 = (Elf64_Sym *) d->d_buf + ndx; + sym64 = (Elf64_Sym *) d->d_data.d_buf + ndx; *sym64 = *gs; } |