Fix: erroneous computation of ELF in-memory size

[lttng-ust.git] / include / lttng / ust-elf.h

diff --git a/include/lttng/ust-elf.h b/include/lttng/ust-elf.h
index 41e3c9b775e10104f1e60014ba58d9922c280b9e..c4abee2dbf1158717cbb0fd0e91485a155965bcf 100644 (file)
--- a/include/lttng/ust-elf.h
+++ b/include/lttng/ust-elf.h
@@ -77,6 +77,7 @@
                bswap((phdr).p_filesz); \
                bswap((phdr).p_memsz);  \
                bswap((phdr).p_align);  \
+               bswap((phdr).p_vaddr);  \
        } while (0)
 
 #define bswap_shdr(shdr)                   \
@@ -117,6 +118,7 @@
                (dst_phdr).p_filesz = (src_phdr).p_filesz;      \
                (dst_phdr).p_memsz = (src_phdr).p_memsz;        \
                (dst_phdr).p_align = (src_phdr).p_align;        \
+               (dst_phdr).p_vaddr = (src_phdr).p_vaddr;        \
        } while (0)
 
 #define copy_shdr(src_shdr, dst_shdr)                                  \
@@ -172,6 +174,7 @@ struct lttng_ust_elf_phdr {
        uint64_t p_filesz;
        uint64_t p_memsz;
        uint64_t p_align;
+       uint64_t p_vaddr;
 };
 
 struct lttng_ust_elf_shdr {
@@ -195,11 +198,11 @@ struct lttng_ust_elf_nhdr {
 
 struct lttng_ust_elf {
        /* Offset in bytes to start of section names string table. */
-       uint64_t section_names_offset;
+       off_t section_names_offset;
        /* Size in bytes of section names string table. */
-       uint64_t section_names_size;
+       size_t section_names_size;
        char *path;
-       FILE *file;
+       int fd;
        struct lttng_ust_elf_ehdr *ehdr;
        uint8_t bitness;
        uint8_t endianness;
@@ -219,6 +222,7 @@ int is_elf_native_endian(struct lttng_ust_elf *elf)
 
 struct lttng_ust_elf *lttng_ust_elf_create(const char *path);
 void lttng_ust_elf_destroy(struct lttng_ust_elf *elf);
+uint8_t lttng_ust_elf_is_pic(struct lttng_ust_elf *elf);
 int lttng_ust_elf_get_memsz(struct lttng_ust_elf *elf, uint64_t *memsz);
 int lttng_ust_elf_get_build_id(struct lttng_ust_elf *elf, uint8_t **build_id,
                        size_t *length, int *found);