diff options
| author | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2011-12-20 10:11:22 -0200 |
|---|---|---|
| committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-12-24 01:44:31 -0200 |
| commit | 4b55befd3739364861dfaaf95fafda4111e80944 (patch) | |
| tree | c4bd99a37911560c14e8372d5bc957d6580bd7fb /libkmod/libkmod-elf.c | |
| parent | f85ae0d5989ff7be01606963ddb4fa093c381a7f (diff) | |
| download | kmod-4b55befd3739364861dfaaf95fafda4111e80944.tar.gz | |
elf: add bind type to kmod_modversion.
will be used to share this structure with get_dependency_symbols()
Diffstat (limited to 'libkmod/libkmod-elf.c')
| -rw-r--r-- | libkmod/libkmod-elf.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c index b4d6882..8c39c06 100644 --- a/libkmod/libkmod-elf.c +++ b/libkmod/libkmod-elf.c @@ -533,6 +533,7 @@ int kmod_elf_get_modversions(const struct kmod_elf *elf, struct kmod_modversion symbol++; a[i].crc = crc; + a[i].bind = KMOD_MODVERSION_UNDEF; a[i].symbol = itr; symbollen = strlen(symbol) + 1; memcpy(itr, symbol, symbollen); @@ -683,6 +684,7 @@ static int kmod_elf_get_symbols_symtab(const struct kmod_elf *elf, struct kmod_m continue; } a[count].crc = 0; + a[count].bind = KMOD_MODVERSION_GLOBAL; a[count].symbol = itr; memcpy(itr, strings + last, slen); itr[slen] = '\0'; @@ -694,6 +696,7 @@ static int kmod_elf_get_symbols_symtab(const struct kmod_elf *elf, struct kmod_m if (strings[i - 1] != '\0') { size_t slen = i - last; a[count].crc = 0; + a[count].bind = KMOD_MODVERSION_GLOBAL; a[count].symbol = itr; memcpy(itr, strings + last, slen); itr[slen] = '\0'; @@ -704,6 +707,20 @@ static int kmod_elf_get_symbols_symtab(const struct kmod_elf *elf, struct kmod_m return count; } +static inline uint8_t kmod_modversion_bind_from_elf(uint8_t elf_value) +{ + switch (elf_value) { + case STB_LOCAL: + return KMOD_MODVERSION_LOCAL; + case STB_GLOBAL: + return KMOD_MODVERSION_GLOBAL; + case STB_WEAK: + return KMOD_MODVERSION_WEAK; + default: + return KMOD_MODVERSION_NONE; + } +} + /* array will be allocated with strings in a single malloc, just free *array */ int kmod_elf_get_symbols(const struct kmod_elf *elf, struct kmod_modversion **array) { @@ -786,6 +803,7 @@ int kmod_elf_get_symbols(const struct kmod_elf *elf, struct kmod_modversion **ar const char *name; uint32_t name_off; uint64_t crc; + uint8_t info, bind; #define READV(field) \ elf_get_uint(elf, sym_off + offsetof(typeof(*s), field),\ @@ -794,10 +812,12 @@ int kmod_elf_get_symbols(const struct kmod_elf *elf, struct kmod_modversion **ar Elf32_Sym *s; name_off = READV(st_name); crc = READV(st_value); + info = READV(st_info); } else { Elf64_Sym *s; name_off = READV(st_name); crc = READV(st_value); + info = READV(st_info); } #undef READV name = elf_get_mem(elf, str_off + name_off); @@ -805,7 +825,13 @@ int kmod_elf_get_symbols(const struct kmod_elf *elf, struct kmod_modversion **ar continue; name += crc_strlen; + if (elf->class & KMOD_ELF_32) + bind = ELF32_ST_BIND(info); + else + bind = ELF64_ST_BIND(info); + a[count].crc = crc; + a[count].bind = kmod_modversion_bind_from_elf(bind); a[count].symbol = itr; slen = strlen(name); memcpy(itr, name, slen); |