projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd: crash on creation of session by peer < 2.11
[lttng-tools.git]
/
src
/
common
/
compat
/
directory-handle.c
diff --git
a/src/common/compat/directory-handle.c
b/src/common/compat/directory-handle.c
index eb1cd926e6e2df0979d041a21532a7a6b141b050..aea4be5fe27ffc54e3c9c873fa36209317cb2ba9 100644
(file)
--- a/
src/common/compat/directory-handle.c
+++ b/
src/common/compat/directory-handle.c
@@
-164,6
+164,8
@@
struct lttng_directory_handle *lttng_directory_handle_create_from_dirfd(
if (ret) {
PERROR("Failed to fstat directory file descriptor %i", dirfd);
lttng_directory_handle_release(&handle->ref);
if (ret) {
PERROR("Failed to fstat directory file descriptor %i", dirfd);
lttng_directory_handle_release(&handle->ref);
+ handle = NULL;
+ goto end;
}
} else {
handle->directory_inode = RESERVED_AT_FDCWD_INO;
}
} else {
handle->directory_inode = RESERVED_AT_FDCWD_INO;
@@
-181,6
+183,10
@@
void lttng_directory_handle_release(struct urcu_ref *ref)
struct lttng_directory_handle *handle =
container_of(ref, struct lttng_directory_handle, ref);
struct lttng_directory_handle *handle =
container_of(ref, struct lttng_directory_handle, ref);
+ if (handle->destroy_cb) {
+ handle->destroy_cb(handle, handle->destroy_cb_data);
+ }
+
if (handle->dirfd == AT_FDCWD || handle->dirfd == -1) {
goto end;
}
if (handle->dirfd == AT_FDCWD || handle->dirfd == -1) {
goto end;
}
@@
-349,7
+355,12
@@
static
int lttng_directory_handle_rmdir(
const struct lttng_directory_handle *handle, const char *name)
{
int lttng_directory_handle_rmdir(
const struct lttng_directory_handle *handle, const char *name)
{
- return unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+ int ret = unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+ if (ret) {
+ PERROR("Failed to remove directory `%s`", name);
+ }
+
+ return ret;
}
static
}
static
@@
-587,7
+598,7
@@
LTTNG_HIDDEN
bool lttng_directory_handle_equals(const struct lttng_directory_handle *lhs,
const struct lttng_directory_handle *rhs)
{
bool lttng_directory_handle_equals(const struct lttng_directory_handle *lhs,
const struct lttng_directory_handle *rhs)
{
- return strcmp(lhs->
path, rhs->
path) == 0;
+ return strcmp(lhs->
base_path, rhs->base_
path) == 0;
}
static
}
static
This page took
0.024543 seconds
and
4
git commands to generate.