X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-elf.c;h=3e0b8890559bd968c45d523fd643c35005f01b99;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=f2c098297acab8955df876f01f97d2a738dc0a81;hpb=ba8dcc8ca5b8b7bebed4e10b3dd4fcbc783d529d;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
index f2c09829..3e0b8890 100644
--- a/liblttng-ust/lttng-ust-elf.c
+++ b/liblttng-ust/lttng-ust-elf.c
@@ -1,34 +1,26 @@
 /*
- * Copyright (C) 2015  Antoine Busque <abusque@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
-#include <helper.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
-#include <lttng/align.h>
-#include <lttng/ust-elf.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <stdbool.h>
+
+#include <lttng/ust-utils.h>
+
+#include <ust-elf.h>
 #include <ust-fd.h>
+
 #include "lttng-tracer-core.h"
+#include "lttng-ust-elf.h"
+#include "ust-helper.h"
 
 #define BUF_LEN	4096
 
@@ -243,12 +235,15 @@ 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) {
@@ -256,12 +251,23 @@ struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
 	}
 
 	lttng_ust_lock_fd_tracker();
-	elf->fd = open(elf->path, O_RDONLY | O_CLOEXEC);
-	if (elf->fd < 0) {
+	fd = open(elf->path, O_RDONLY | O_CLOEXEC);
+	if (fd < 0) {
 		lttng_ust_unlock_fd_tracker();
 		goto error;
 	}
-	lttng_ust_add_fd_to_tracker(elf->fd);
+
+	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) {
@@ -433,7 +439,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;
 		}
@@ -458,7 +464,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) {
 			/*
@@ -574,6 +580,7 @@ error:
  *
  * Returns 0 on success, -1 if an error occurred.
  */
+static
 int lttng_ust_elf_get_debug_link_from_section(struct lttng_ust_elf *elf,
 					char **filename, uint32_t *crc,
 					struct lttng_ust_elf_shdr *shdr)