projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: runas: supplementary groups are ignored on lttng save
[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..a66d768e871f5eef5ae4be4556d3636c69c9fdca 100644
(file)
--- a/
src/common/compat/directory-handle.c
+++ b/
src/common/compat/directory-handle.c
@@
-78,7
+78,7
@@
void lttng_directory_handle_invalidate(struct lttng_directory_handle *handle);
static
void lttng_directory_handle_release(struct urcu_ref *ref);
static
void lttng_directory_handle_release(struct urcu_ref *ref);
-#ifdef
COMPAT
_DIRFD
+#ifdef
HAVE
_DIRFD
/*
* Special inode number reserved to represent the "current working directory".
/*
* Special inode number reserved to represent the "current working directory".
@@
-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
@@
-367,7
+378,7
@@
int _run_as_rmdir_recursive(
return run_as_rmdirat_recursive(handle->dirfd, name, uid, gid, flags);
}
return run_as_rmdirat_recursive(handle->dirfd, name, uid, gid, flags);
}
-#else /*
COMPAT
_DIRFD */
+#else /*
HAVE
_DIRFD */
static
int get_full_path(const struct lttng_directory_handle *handle,
static
int get_full_path(const struct lttng_directory_handle *handle,
@@
-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
@@
-880,7
+891,7
@@
end:
return ret;
}
return ret;
}
-#endif /*
COMPAT
_DIRFD */
+#endif /*
HAVE
_DIRFD */
/* Common implementation. */
/* Common implementation. */
@@
-1008,8
+1019,9
@@
int lttng_directory_handle_create_subdirectory_as_user(
ret = create_directory_check_exists(handle,
subdirectory, mode);
} else {
ret = create_directory_check_exists(handle,
subdirectory, mode);
} else {
- ret = _run_as_mkdir(handle, subdirectory,
- mode, creds->uid, creds->gid);
+ ret = _run_as_mkdir(handle, subdirectory, mode,
+ lttng_credentials_get_uid(creds),
+ lttng_credentials_get_gid(creds));
}
return ret;
}
return ret;
@@
-1029,7
+1041,7
@@
int lttng_directory_handle_create_subdirectory_recursive_as_user(
subdirectory_path, mode);
} else {
ret = _run_as_mkdir_recursive(handle, subdirectory_path,
subdirectory_path, mode);
} else {
ret = _run_as_mkdir_recursive(handle, subdirectory_path,
- mode,
creds->uid, creds->gid
);
+ mode,
lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds)
);
}
return ret;
}
return ret;
@@
-1070,7
+1082,7
@@
int lttng_directory_handle_open_file_as_user(
mode);
} else {
ret = _run_as_open(handle, filename, flags, mode,
mode);
} else {
ret = _run_as_open(handle, filename, flags, mode,
-
creds->uid, creds->gid
);
+
lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds)
);
}
return ret;
}
}
return ret;
}
@@
-1097,7
+1109,7
@@
int lttng_directory_handle_unlink_file_as_user(
/* Run as current user. */
ret = lttng_directory_handle_unlink(handle, filename);
} else {
/* Run as current user. */
ret = lttng_directory_handle_unlink(handle, filename);
} else {
- ret = _run_as_unlink(handle, filename,
creds->uid, creds->gid
);
+ ret = _run_as_unlink(handle, filename,
lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds)
);
}
return ret;
}
}
return ret;
}
@@
-1138,7
+1150,7
@@
int lttng_directory_handle_rename_as_user(
old_name, new_handle, new_name);
} else {
ret = _run_as_rename(old_handle, old_name, new_handle,
old_name, new_handle, new_name);
} else {
ret = _run_as_rename(old_handle, old_name, new_handle,
- new_name,
creds->uid, creds->gid
);
+ new_name,
lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds)
);
}
return ret;
}
}
return ret;
}
@@
-1164,7
+1176,7
@@
int lttng_directory_handle_remove_subdirectory_as_user(
/* Run as current user. */
ret = lttng_directory_handle_rmdir(handle, name);
} else {
/* Run as current user. */
ret = lttng_directory_handle_rmdir(handle, name);
} else {
- ret = _run_as_rmdir(handle, name,
creds->uid, creds->gid
);
+ ret = _run_as_rmdir(handle, name,
lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds)
);
}
return ret;
}
}
return ret;
}
@@
-1398,8
+1410,8
@@
int lttng_directory_handle_remove_subdirectory_recursive_as_user(
/* Run as current user. */
ret = remove_directory_recursive(handle, name, flags);
} else {
/* Run as current user. */
ret = remove_directory_recursive(handle, name, flags);
} else {
- ret = _run_as_rmdir_recursive(handle, name,
creds->uid
,
-
creds->gid
, flags);
+ ret = _run_as_rmdir_recursive(handle, name,
lttng_credentials_get_uid(creds)
,
+
lttng_credentials_get_gid(creds)
, flags);
}
return ret;
}
}
return ret;
}
This page took
0.027214 seconds
and
4
git commands to generate.