X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ust-elf.c;h=346545583c3a23b399b9a71911c59e5ded6bc387;hb=444da810e491b66b873466c240202c27e0cd1adc;hp=116a3a6df4c5705319e83de3245ededd878716fa;hpb=814d07b125fd4e0d24648d6d5215df09ccd4a0d4;p=lttng-ust.git diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c index 116a3a6d..34654558 100644 --- a/liblttng-ust/lttng-ust-elf.c +++ b/liblttng-ust/lttng-ust-elf.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define _GNU_SOURCE #include #include #include @@ -39,7 +40,7 @@ struct lttng_ust_elf_phdr *lttng_ust_elf_get_phdr(struct lttng_ust_elf *elf, uint16_t index) { struct lttng_ust_elf_phdr *phdr = NULL; - long offset; + off_t offset; if (!elf) { goto error; @@ -54,7 +55,8 @@ struct lttng_ust_elf_phdr *lttng_ust_elf_get_phdr(struct lttng_ust_elf *elf, goto error; } - offset = elf->ehdr->e_phoff + index * elf->ehdr->e_phentsize; + offset = (off_t) elf->ehdr->e_phoff + + (off_t) index * elf->ehdr->e_phentsize; if (lseek(elf->fd, offset, SEEK_SET) < 0) { goto error; } @@ -101,7 +103,7 @@ struct lttng_ust_elf_shdr *lttng_ust_elf_get_shdr(struct lttng_ust_elf *elf, uint16_t index) { struct lttng_ust_elf_shdr *shdr = NULL; - long offset; + off_t offset; if (!elf) { goto error; @@ -116,7 +118,8 @@ struct lttng_ust_elf_shdr *lttng_ust_elf_get_shdr(struct lttng_ust_elf *elf, goto error; } - offset = elf->ehdr->e_shoff + index * elf->ehdr->e_shentsize; + offset = (off_t) elf->ehdr->e_shoff + + (off_t) index * elf->ehdr->e_shentsize; if (lseek(elf->fd, offset, SEEK_SET) < 0) { goto error; } @@ -160,7 +163,7 @@ error: * If no name is found, NULL is returned. */ static -char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, uint32_t offset) +char *lttng_ust_elf_get_section_name(struct lttng_ust_elf *elf, off_t offset) { char *name = NULL; size_t len = 0, to_read; /* len does not include \0 */ @@ -313,6 +316,18 @@ error: return NULL; } +/* + * Test whether the ELF file is position independent code (PIC) + */ +uint8_t lttng_ust_elf_is_pic(struct lttng_ust_elf *elf) +{ + /* + * PIC has and e_type value of ET_DYN, see ELF specification + * version 1.1 p. 1-3. + */ + return elf->ehdr->e_type == ET_DYN; +} + /* * Destroy the given lttng_ust_elf instance. */ @@ -403,11 +418,10 @@ error: static int lttng_ust_elf_get_build_id_from_segment( struct lttng_ust_elf *elf, uint8_t **build_id, size_t *length, - uint64_t offset, uint64_t segment_end, int *found) + off_t offset, off_t segment_end) { uint8_t *_build_id = NULL; /* Silence old gcc warning. */ size_t _length = 0; /* Silence old gcc warning. */ - int _found = 0; while (offset < segment_end) { struct lttng_ust_elf_nhdr nhdr; @@ -452,7 +466,7 @@ int lttng_ust_elf_get_build_id_from_segment( _length = nhdr.n_descsz; _build_id = zmalloc(sizeof(uint8_t) * _length); - if (!build_id) { + if (!_build_id) { goto error; } @@ -464,18 +478,17 @@ int lttng_ust_elf_get_build_id_from_segment( goto error; } - _found = 1; break; } - if (_found) { + if (_build_id) { *build_id = _build_id; *length = _length; } - *found = _found; return 0; error: + free(_build_id); return -1; } @@ -496,16 +509,15 @@ int lttng_ust_elf_get_build_id(struct lttng_ust_elf *elf, uint8_t **build_id, size_t *length, int *found) { uint16_t i; - uint8_t *_build_id; - size_t _length; - int _found = 0; + uint8_t *_build_id = NULL; /* Silence old gcc warning. */ + size_t _length = 0; /* Silence old gcc warning. */ if (!elf || !build_id || !length || !found) { goto error; } for (i = 0; i < elf->ehdr->e_phnum; ++i) { - uint64_t offset, segment_end; + off_t offset, segment_end; struct lttng_ust_elf_phdr *phdr; int ret = 0; @@ -522,26 +534,28 @@ int lttng_ust_elf_get_build_id(struct lttng_ust_elf *elf, uint8_t **build_id, offset = phdr->p_offset; segment_end = offset + phdr->p_filesz; ret = lttng_ust_elf_get_build_id_from_segment( - elf, &_build_id, &_length, offset, segment_end, - &_found); + elf, &_build_id, &_length, offset, segment_end); next_loop: free(phdr); if (ret) { goto error; } - if (_found) { + if (_build_id) { break; } } - if (_found) { + if (_build_id) { *build_id = _build_id; *length = _length; + *found = 1; + } else { + *found = 0; } - *found = _found; return 0; error: + free(_build_id); return -1; } @@ -557,16 +571,14 @@ error: */ int lttng_ust_elf_get_debug_link_from_section(struct lttng_ust_elf *elf, char **filename, uint32_t *crc, - int *found, struct lttng_ust_elf_shdr *shdr) { - int _found = 0; - char *_filename; + char *_filename = NULL; /* Silence old gcc warning. */ size_t filename_len; char *section_name = NULL; - uint32_t _crc; + uint32_t _crc = 0; /* Silence old gcc warning. */ - if (!elf || !filename || !crc || !found || !shdr) { + if (!elf || !filename || !crc || !shdr) { goto error; } @@ -609,23 +621,18 @@ int lttng_ust_elf_get_debug_link_from_section(struct lttng_ust_elf *elf, _crc = bswap_32(_crc); } - _found = 1; - end: free(section_name); - if (_found) { + if (_filename) { *filename = _filename; *crc = _crc; } - *found = _found; return 0; error: - if (section_name) { - free(section_name); - } - + free(_filename); + free(section_name); return -1; } @@ -644,9 +651,8 @@ int lttng_ust_elf_get_debug_link(struct lttng_ust_elf *elf, char **filename, { int ret; uint16_t i; - int _found = 0; - char *_filename; - uint32_t _crc; + char *_filename = NULL; /* Silence old gcc warning. */ + uint32_t _crc = 0; /* Silence old gcc warning. */ if (!elf || !filename || !crc || !found) { goto error; @@ -661,24 +667,28 @@ int lttng_ust_elf_get_debug_link(struct lttng_ust_elf *elf, char **filename, } ret = lttng_ust_elf_get_debug_link_from_section( - elf, &_filename, &_crc, &_found, shdr); + elf, &_filename, &_crc, shdr); free(shdr); if (ret) { goto error; } - if (_found) { + if (_filename) { break; } } - if (_found) { + if (_filename) { *filename = _filename; *crc = _crc; + *found = 1; + } else { + *found = 0; } - *found = _found; return 0; + error: + free(_filename); return -1; }