Fix: event-notifier: not propagating error counter indexes

[lttng-ust.git] / liblttng-ust / lttng-ust-elf.c

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index 5f27920e48fa041f1d971677b56c643993064de9..a02ba8d9eb38e3eb418f02dd82f53c270694f03c 100644 (file)
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -16,19 +16,28 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
+#include <fcntl.h>
 #include <helper.h>
-#include <string.h>
 #include <lttng/align.h>
 #include <lttng/ust-elf.h>
-#include <sys/types.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
+
+#include <ust-fd.h>
+
 #include "lttng-tracer-core.h"
 
 #define BUF_LEN        4096
 
+#ifndef NT_GNU_BUILD_ID
+# define NT_GNU_BUILD_ID       3
+#endif
+
 /*
  * Retrieve the nth (where n is the `index` argument) phdr (program
  * header) from the given elf instance.
@@ -236,21 +245,40 @@ struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
        uint8_t e_ident[EI_NIDENT];
        struct lttng_ust_elf_shdr *section_names_shdr;
        struct lttng_ust_elf *elf = NULL;
+       int ret, fd;
 
        elf = zmalloc(sizeof(struct lttng_ust_elf));
        if (!elf) {
                goto error;
        }
 
+       /* Initialize fd field to -1. 0 is a valid fd number */
+       elf->fd = -1;
+
        elf->path = strdup(path);
        if (!elf->path) {
                goto error;
        }
 
-       elf->fd = open(elf->path, O_RDONLY | O_CLOEXEC);
-       if (elf->fd < 0) {
+       lttng_ust_lock_fd_tracker();
+       fd = open(elf->path, O_RDONLY | O_CLOEXEC);
+       if (fd < 0) {
+               lttng_ust_unlock_fd_tracker();
+               goto error;
+       }
+
+       ret = lttng_ust_add_fd_to_tracker(fd);
+       if (ret < 0) {
+               ret = close(fd);
+               if (ret) {
+                       PERROR("close on elf->fd");
+               }
+               ret = -1;
+               lttng_ust_unlock_fd_tracker();
                goto error;
        }
+       elf->fd = ret;
+       lttng_ust_unlock_fd_tracker();
 
        if (lttng_ust_read(elf->fd, e_ident, EI_NIDENT) < EI_NIDENT) {
                goto error;
@@ -303,16 +331,7 @@ struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
        return elf;
 
 error:
-       if (elf) {
-               free(elf->ehdr);
-               if (elf->fd >= 0) {
-                       if (close(elf->fd)) {
-                               abort();
-                       }
-               }
-               free(elf->path);
-               free(elf);
-       }
+       lttng_ust_elf_destroy(elf);
        return NULL;
 }
 
@@ -333,14 +352,25 @@ uint8_t lttng_ust_elf_is_pic(struct lttng_ust_elf *elf)
  */
 void lttng_ust_elf_destroy(struct lttng_ust_elf *elf)
 {
+       int ret;
+
        if (!elf) {
                return;
        }
 
-       free(elf->ehdr);
-       if (close(elf->fd)) {
-               abort();
+       if (elf->fd >= 0) {
+               lttng_ust_lock_fd_tracker();
+               ret = close(elf->fd);
+               if (!ret) {
+                       lttng_ust_delete_fd_from_tracker(elf->fd);
+               } else {
+                       PERROR("close");
+                       abort();
+               }
+               lttng_ust_unlock_fd_tracker();
        }
+
+       free(elf->ehdr);
        free(elf->path);
        free(elf);
 }
@@ -419,7 +449,7 @@ int lttng_ust_elf_get_build_id_from_segment(
                size_t read_len;
 
                /* Align start of note entry */
-               offset += offset_align(offset, ELF_NOTE_ENTRY_ALIGN);
+               offset += lttng_ust_offset_align(offset, ELF_NOTE_ENTRY_ALIGN);
                if (offset >= segment_end) {
                        break;
                }
@@ -444,7 +474,7 @@ int lttng_ust_elf_get_build_id_from_segment(
 
                offset += sizeof(nhdr) + nhdr.n_namesz;
                /* Align start of desc entry */
-               offset += offset_align(offset, ELF_NOTE_DESC_ALIGN);
+               offset += lttng_ust_offset_align(offset, ELF_NOTE_DESC_ALIGN);
 
                if (nhdr.n_type != NT_GNU_BUILD_ID) {
                        /*