projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: fd of an elf object must be registered to the fd tracker
[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 663699b7ce91a5d9febf0d9903b64d042a580782..f2c098297acab8955df876f01f97d2a738dc0a81 100644
(file)
--- a/
liblttng-ust/lttng-ust-elf.c
+++ b/
liblttng-ust/lttng-ust-elf.c
@@
-27,10
+27,15
@@
#include <fcntl.h>
#include <unistd.h>
#include <stdbool.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdbool.h>
+#include <ust-fd.h>
#include "lttng-tracer-core.h"
#define BUF_LEN 4096
#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.
/*
* Retrieve the nth (where n is the `index` argument) phdr (program
* header) from the given elf instance.
@@
-244,15
+249,20
@@
struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
goto error;
}
goto error;
}
+
elf->path = strdup(path);
if (!elf->path) {
goto error;
}
elf->path = strdup(path);
if (!elf->path) {
goto error;
}
+ lttng_ust_lock_fd_tracker();
elf->fd = open(elf->path, O_RDONLY | O_CLOEXEC);
if (elf->fd < 0) {
elf->fd = open(elf->path, O_RDONLY | O_CLOEXEC);
if (elf->fd < 0) {
+ lttng_ust_unlock_fd_tracker();
goto error;
}
goto error;
}
+ lttng_ust_add_fd_to_tracker(elf->fd);
+ lttng_ust_unlock_fd_tracker();
if (lttng_ust_read(elf->fd, e_ident, EI_NIDENT) < EI_NIDENT) {
goto error;
if (lttng_ust_read(elf->fd, e_ident, EI_NIDENT) < EI_NIDENT) {
goto error;
@@
-305,16
+315,7
@@
struct lttng_ust_elf *lttng_ust_elf_create(const char *path)
return elf;
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;
}
return NULL;
}
@@
-335,14
+336,25
@@
uint8_t lttng_ust_elf_is_pic(struct lttng_ust_elf *elf)
*/
void lttng_ust_elf_destroy(struct lttng_ust_elf *elf)
{
*/
void lttng_ust_elf_destroy(struct lttng_ust_elf *elf)
{
+ int ret;
+
if (!elf) {
return;
}
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);
}
free(elf->path);
free(elf);
}
This page took
0.030278 seconds
and
4
git commands to generate.