/*
- * 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 _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.
uint16_t index)
{
struct lttng_ust_elf_phdr *phdr = NULL;
- long offset;
+ off_t offset;
if (!elf) {
goto error;
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;
}
uint16_t index)
{
struct lttng_ust_elf_shdr *shdr = NULL;
- long offset;
+ off_t offset;
if (!elf) {
goto error;
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;
}
* 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 */
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;
}
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;
}
+/*
+ * 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.
*/
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);
}
int lttng_ust_elf_get_memsz(struct lttng_ust_elf *elf, uint64_t *memsz)
{
uint16_t i;
- uint64_t _memsz = 0;
+ uint64_t low_addr = UINT64_MAX, high_addr = 0;
if (!elf || !memsz) {
goto error;
for (i = 0; i < elf->ehdr->e_phnum; ++i) {
struct lttng_ust_elf_phdr *phdr;
- uint64_t align;
phdr = lttng_ust_elf_get_phdr(elf, i);
if (!phdr) {
goto next_loop;
}
- /*
- * A p_align of 0 means no alignment, i.e. aligned to
- * 1 byte.
- */
- align = phdr->p_align == 0 ? 1 : phdr->p_align;
- /* Align the start of the segment. */
- _memsz += offset_align(_memsz, align);
- _memsz += phdr->p_memsz;
- /*
- * Add padding at the end of the segment, so it ends
- * on a multiple of the align value (which usually
- * means a page boundary). This makes the computation
- * valid even in cases where p_align would change from
- * one segment to the next.
- */
- _memsz += offset_align(_memsz, align);
+ low_addr = min_t(uint64_t, low_addr, phdr->p_vaddr);
+ high_addr = max_t(uint64_t, high_addr,
+ phdr->p_vaddr + phdr->p_memsz);
next_loop:
free(phdr);
}
- *memsz = _memsz;
+ if (high_addr < low_addr) {
+ /* No PT_LOAD segments or corrupted data. */
+ goto error;
+ }
+
+ *memsz = high_addr - low_addr;
return 0;
error:
return -1;
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;
- size_t _length;
- int _found = 0;
+ uint8_t *_build_id = NULL; /* Silence old gcc warning. */
+ size_t _length = 0; /* Silence old gcc warning. */
while (offset < segment_end) {
struct lttng_ust_elf_nhdr nhdr;
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) {
/*
_length = nhdr.n_descsz;
_build_id = zmalloc(sizeof(uint8_t) * _length);
- if (!build_id) {
+ if (!_build_id) {
goto error;
}
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;
}
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;
+ int ret = 0;
phdr = lttng_ust_elf_get_phdr(elf, i);
if (!phdr) {
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;
}
*/
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;
}
_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;
}
{
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;
}
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;
}
projects / lttng-ust.git / blobdiff