projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Check use_clone() instead of worker in run_as
[lttng-tools.git]
/
src
/
common
/
runas.c
diff --git
a/src/common/runas.c
b/src/common/runas.c
index daba9937ce364d5113c2f6dfb61cbbb98f3b16e2..3a1de0a3acdd2b3613d715d48f404c3a60eb9eeb 100644
(file)
--- a/
src/common/runas.c
+++ b/
src/common/runas.c
@@
-30,6
+30,7
@@
#include <fcntl.h>
#include <sched.h>
#include <sys/signal.h>
#include <fcntl.h>
#include <sched.h>
#include <sys/signal.h>
+#include <assert.h>
#include <common/common.h>
#include <common/utils.h>
#include <common/common.h>
#include <common/utils.h>
@@
-216,7
+217,9
@@
int do_recv_fd(struct run_as_worker *worker,
return 0;
}
len = lttcomm_recv_fds_unix_sock(worker->sockpair[0], fd, 1);
return 0;
}
len = lttcomm_recv_fds_unix_sock(worker->sockpair[0], fd, 1);
- if (len < 0) {
+ if (!len) {
+ return -1;
+ } else if (len < 0) {
PERROR("lttcomm_recv_fds_unix_sock");
return -1;
}
PERROR("lttcomm_recv_fds_unix_sock");
return -1;
}
@@
-362,7
+365,6
@@
int run_as_cmd(struct run_as_worker *worker,
ssize_t readlen, writelen;
struct run_as_ret recvret;
ssize_t readlen, writelen;
struct run_as_ret recvret;
- pthread_mutex_lock(&worker_lock);
/*
* If we are non-root, we can only deal with our own uid.
*/
/*
* If we are non-root, we can only deal with our own uid.
*/
@@
-392,18
+394,22
@@
int run_as_cmd(struct run_as_worker *worker,
/* receive return value */
readlen = lttcomm_recv_unix_sock(worker->sockpair[0], &recvret,
sizeof(recvret));
/* receive return value */
readlen = lttcomm_recv_unix_sock(worker->sockpair[0], &recvret,
sizeof(recvret));
- if (readlen < sizeof(recvret)) {
+ if (!readlen) {
+ ERR("Run-as worker has hung-up during run_as_cmd");
+ recvret.ret = -1;
+ recvret._errno = EIO;
+ goto end;
+ } else if (readlen < sizeof(recvret)) {
PERROR("Error reading response from run_as");
recvret.ret = -1;
recvret._errno = errno;
}
if (do_recv_fd(worker, cmd, &recvret.ret)) {
recvret.ret = -1;
PERROR("Error reading response from run_as");
recvret.ret = -1;
recvret._errno = errno;
}
if (do_recv_fd(worker, cmd, &recvret.ret)) {
recvret.ret = -1;
- recvret._errno =
-
EIO;
+ recvret._errno = EIO;
}
end:
}
end:
- pthread_mutex_unlock(&worker_lock);
errno = recvret._errno;
return recvret.ret;
}
errno = recvret._errno;
return recvret.ret;
}
@@
-435,15
+441,17
@@
end:
}
static
}
static
-int run_as(struct run_as_worker *worker,
- enum run_as_cmd cmd,
- struct run_as_data *data, uid_t uid, gid_t gid)
+int run_as(enum run_as_cmd cmd, struct run_as_data *data, uid_t uid, gid_t gid)
{
int ret;
{
int ret;
- if (
worker
) {
+ if (
use_clone()
) {
DBG("Using run_as worker");
DBG("Using run_as worker");
- ret = run_as_cmd(worker, cmd, data, uid, gid);
+ pthread_mutex_lock(&worker_lock);
+ assert(global_worker);
+ ret = run_as_cmd(global_worker, cmd, data, uid, gid);
+ pthread_mutex_unlock(&worker_lock);
+
} else {
DBG("Using run_as without worker");
ret = run_as_noworker(cmd, data, uid, gid);
} else {
DBG("Using run_as without worker");
ret = run_as_noworker(cmd, data, uid, gid);
@@
-454,7
+462,6
@@
int run_as(struct run_as_worker *worker,
LTTNG_HIDDEN
int run_as_mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
{
LTTNG_HIDDEN
int run_as_mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
{
- struct run_as_worker *worker = global_worker;
struct run_as_data data;
DBG3("mkdir() recursive %s with mode %d for uid %d and gid %d",
struct run_as_data data;
DBG3("mkdir() recursive %s with mode %d for uid %d and gid %d",
@@
-462,13
+469,12
@@
int run_as_mkdir_recursive(const char *path, mode_t mode, uid_t uid, gid_t gid)
strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
data.u.mkdir.path[PATH_MAX - 1] = '\0';
data.u.mkdir.mode = mode;
strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
data.u.mkdir.path[PATH_MAX - 1] = '\0';
data.u.mkdir.mode = mode;
- return run_as(
worker,
RUN_AS_MKDIR_RECURSIVE, &data, uid, gid);
+ return run_as(RUN_AS_MKDIR_RECURSIVE, &data, uid, gid);
}
LTTNG_HIDDEN
int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
{
}
LTTNG_HIDDEN
int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
{
- struct run_as_worker *worker = global_worker;
struct run_as_data data;
DBG3("mkdir() %s with mode %d for uid %d and gid %d",
struct run_as_data data;
DBG3("mkdir() %s with mode %d for uid %d and gid %d",
@@
-476,7
+482,7
@@
int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
data.u.mkdir.path[PATH_MAX - 1] = '\0';
data.u.mkdir.mode = mode;
strncpy(data.u.mkdir.path, path, PATH_MAX - 1);
data.u.mkdir.path[PATH_MAX - 1] = '\0';
data.u.mkdir.mode = mode;
- return run_as(
worker,
RUN_AS_MKDIR, &data, uid, gid);
+ return run_as(RUN_AS_MKDIR, &data, uid, gid);
}
/*
}
/*
@@
-486,7
+492,6
@@
int run_as_mkdir(const char *path, mode_t mode, uid_t uid, gid_t gid)
LTTNG_HIDDEN
int run_as_open(const char *path, int flags, mode_t mode, uid_t uid, gid_t gid)
{
LTTNG_HIDDEN
int run_as_open(const char *path, int flags, mode_t mode, uid_t uid, gid_t gid)
{
- struct run_as_worker *worker = global_worker;
struct run_as_data data;
DBG3("open() %s with flags %X mode %d for uid %d and gid %d",
struct run_as_data data;
DBG3("open() %s with flags %X mode %d for uid %d and gid %d",
@@
-495,33
+500,31
@@
int run_as_open(const char *path, int flags, mode_t mode, uid_t uid, gid_t gid)
data.u.open.path[PATH_MAX - 1] = '\0';
data.u.open.flags = flags;
data.u.open.mode = mode;
data.u.open.path[PATH_MAX - 1] = '\0';
data.u.open.flags = flags;
data.u.open.mode = mode;
- return run_as(
worker,
RUN_AS_OPEN, &data, uid, gid);
+ return run_as(RUN_AS_OPEN, &data, uid, gid);
}
LTTNG_HIDDEN
int run_as_unlink(const char *path, uid_t uid, gid_t gid)
{
}
LTTNG_HIDDEN
int run_as_unlink(const char *path, uid_t uid, gid_t gid)
{
- struct run_as_worker *worker = global_worker;
struct run_as_data data;
DBG3("unlink() %s with for uid %d and gid %d",
path, uid, gid);
strncpy(data.u.unlink.path, path, PATH_MAX - 1);
data.u.unlink.path[PATH_MAX - 1] = '\0';
struct run_as_data data;
DBG3("unlink() %s with for uid %d and gid %d",
path, uid, gid);
strncpy(data.u.unlink.path, path, PATH_MAX - 1);
data.u.unlink.path[PATH_MAX - 1] = '\0';
- return run_as(
worker,
RUN_AS_UNLINK, &data, uid, gid);
+ return run_as(RUN_AS_UNLINK, &data, uid, gid);
}
LTTNG_HIDDEN
int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
{
}
LTTNG_HIDDEN
int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
{
- struct run_as_worker *worker = global_worker;
struct run_as_data data;
DBG3("rmdir_recursive() %s with for uid %d and gid %d",
path, uid, gid);
strncpy(data.u.rmdir_recursive.path, path, PATH_MAX - 1);
data.u.rmdir_recursive.path[PATH_MAX - 1] = '\0';
struct run_as_data data;
DBG3("rmdir_recursive() %s with for uid %d and gid %d",
path, uid, gid);
strncpy(data.u.rmdir_recursive.path, path, PATH_MAX - 1);
data.u.rmdir_recursive.path[PATH_MAX - 1] = '\0';
- return run_as(
worker,
RUN_AS_RMDIR_RECURSIVE, &data, uid, gid);
+ return run_as(RUN_AS_RMDIR_RECURSIVE, &data, uid, gid);
}
LTTNG_HIDDEN
}
LTTNG_HIDDEN
@@
-533,7
+536,13
@@
int run_as_create_worker(char *procname)
struct run_as_ret recvret;
struct run_as_worker *worker;
struct run_as_ret recvret;
struct run_as_worker *worker;
+ pthread_mutex_lock(&worker_lock);
+ assert(!global_worker);
if (!use_clone()) {
if (!use_clone()) {
+ /*
+ * Don't initialize a worker, all run_as tasks will be performed
+ * in the current process.
+ */
ret = 0;
goto end;
}
ret = 0;
goto end;
}
@@
-557,6
+566,8
@@
int run_as_create_worker(char *procname)
} else if (pid == 0) {
/* Child */
} else if (pid == 0) {
/* Child */
+ /* The child has no use for this lock. */
+ pthread_mutex_unlock(&worker_lock);
/* Just close, no shutdown. */
if (close(worker->sockpair[0])) {
PERROR("close");
/* Just close, no shutdown. */
if (close(worker->sockpair[0])) {
PERROR("close");
@@
-593,6
+604,7
@@
int run_as_create_worker(char *procname)
global_worker = worker;
}
end:
global_worker = worker;
}
end:
+ pthread_mutex_unlock(&worker_lock);
return ret;
/* Error handling. */
return ret;
/* Error handling. */
@@
-608,6
+620,7
@@
error_fork:
}
error_sock:
free(worker);
}
error_sock:
free(worker);
+ pthread_mutex_unlock(&worker_lock);
return ret;
}
return ret;
}
@@
-618,8
+631,9
@@
void run_as_destroy_worker(void)
int status;
pid_t pid;
int status;
pid_t pid;
+ pthread_mutex_lock(&worker_lock);
if (!worker) {
if (!worker) {
-
return
;
+
goto end
;
}
/* Close unix socket */
if (lttcomm_close_unix_sock(worker->sockpair[0])) {
}
/* Close unix socket */
if (lttcomm_close_unix_sock(worker->sockpair[0])) {
@@
-633,4
+647,6
@@
void run_as_destroy_worker(void)
}
free(worker);
global_worker = NULL;
}
free(worker);
global_worker = NULL;
+end:
+ pthread_mutex_unlock(&worker_lock);
}
}
This page took
0.028549 seconds
and
5
git commands to generate.