/*
- * 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
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) {
}
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) {
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;
}
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) {
/*
*
* 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)