projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: restart consumerd and sessiond when interrupted in poll()
[lttng-tools.git]
/
src
/
common
/
runas.c
diff --git
a/src/common/runas.c
b/src/common/runas.c
index cc503412689f55f48524ef515d608a9f1a4cdf4b..745a6d0d13643d2333ee1bfe5c8b3e4c8fe4fb3b 100644
(file)
--- a/
src/common/runas.c
+++ b/
src/common/runas.c
@@
-30,12
+30,16
@@
#include <sched.h>
#include <sys/mman.h>
#include <sched.h>
#include <sys/mman.h>
-#include <common/
lttnger
r.h>
+#include <common/
erro
r.h>
#include "runas.h"
#define RUNAS_CHILD_STACK_SIZE 10485760
#include "runas.h"
#define RUNAS_CHILD_STACK_SIZE 10485760
+#ifndef MAP_STACK
+#define MAP_STACK 0
+#endif
+
struct run_as_data {
int (*cmd)(void *data);
void *data;
struct run_as_data {
int (*cmd)(void *data);
void *data;
@@
-211,6
+215,7
@@
int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
ret = pipe(retval_pipe);
if (ret < 0) {
perror("pipe");
ret = pipe(retval_pipe);
if (ret < 0) {
perror("pipe");
+ retval.i = ret;
goto end;
}
run_as_data.data = data;
goto end;
}
run_as_data.data = data;
@@
-224,7
+229,7
@@
int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
-1, 0);
if (child_stack == MAP_FAILED) {
perror("mmap");
-1, 0);
if (child_stack == MAP_FAILED) {
perror("mmap");
- ret = -ENOMEM;
+ ret
val.i
= -ENOMEM;
goto close_pipe;
}
/*
goto close_pipe;
}
/*
@@
-236,7
+241,7
@@
int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
&run_as_data, NULL);
if (pid < 0) {
perror("clone");
&run_as_data, NULL);
if (pid < 0) {
perror("clone");
- ret = pid;
+ ret
val.i
= pid;
goto unmap_stack;
}
/* receive return value */
goto unmap_stack;
}
/* receive return value */
@@
-260,12
+265,13
@@
int run_as(int (*cmd)(void *data), void *data, uid_t uid, gid_t gid)
pid = waitpid(pid, &status, 0);
if (pid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
perror("wait");
pid = waitpid(pid, &status, 0);
if (pid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0) {
perror("wait");
- ret = -1;
+ ret
val.i
= -1;
}
unmap_stack:
ret = munmap(child_stack, RUNAS_CHILD_STACK_SIZE);
if (ret < 0) {
perror("munmap");
}
unmap_stack:
ret = munmap(child_stack, RUNAS_CHILD_STACK_SIZE);
if (ret < 0) {
perror("munmap");
+ retval.i = ret;
}
close_pipe:
close(retval_pipe[0]);
}
close_pipe:
close(retval_pipe[0]);
This page took
0.024334 seconds
and
4
git commands to generate.