verdnatura-mirror
/
tini
mirror of https://github.com/krallin/tini.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add stdio attribute

This commit is contained in:
Sargun Dhillon 2017-04-22 16:21:23 -07:00
parent 4f0a972340
commit e266387a86
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tini.c
View File

@ -19,6 +19,8 @@
#include <sys/un.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <attr/xattr.h>
#include "tiniConfig.h"
#include "tiniLicense.h"
@ -29,6 +31,7 @@
#define REDIRECT_STDOUT "TITUS_REDIRECT_STDOUT"
#define TITUS_CB_PATH "TITUS_UNIX_CB_PATH"
const char stdioattr[] = "user.stdio";
#if TINI_MINIMAL
#define PRINT_FATAL(...) fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n");
@ -148,6 +151,9 @@ int spawn(const signal_configuration_t* const sigconf_ptr, char* const argv[], i
char *redir_path;
pid_t pid;
// So, we might leak file descriptors here. For example, if we successfully wire up the stdout,
// but the stderr fd fails. Fortunately, this should make the init in the container bail entirely.
// This will have the side-effect of closing all of our file descriptors.
redir_path = getenv(REDIRECT_STDOUT);
if (redir_path) {
new_stdout_fd = open(redir_path, O_WRONLY | O_CREAT | O_APPEND, S_IRUGO | S_IWUGO);
@ -155,6 +161,10 @@ int spawn(const signal_configuration_t* const sigconf_ptr, char* const argv[], i
PRINT_FATAL("Failed to open stdout redirect path: %s", strerror(errno));
return 1;
}
if (fsetxattr(new_stdout_fd, stdioattr, NULL, 0, 0) == -1) {
PRINT_FATAL("Unable to set stdio attribute on stdout redirect: %s", strerror(errno));
return 1;
}
}
redir_path = getenv(REDIRECT_STDERR);
@ -164,6 +174,10 @@ int spawn(const signal_configuration_t* const sigconf_ptr, char* const argv[], i
PRINT_FATAL("Failed to open stderr redirect path: %s", strerror(errno));
return 1;
}
if (fsetxattr(new_stderr_fd, stdioattr, NULL, 0, 0) == -1) {
PRINT_FATAL("Unable to set stdio attribute on stderr redirect: %s", strerror(errno));
return 1;
}
}
// TODO: check if tini was a foreground process to begin with (it's not OK to "steal" the foreground!")
@ -218,6 +232,11 @@ int spawn(const signal_configuration_t* const sigconf_ptr, char* const argv[], i
return status;
} else {
// Parent
if (new_stdout_fd != 1)
close(new_stdout_fd);
if (new_stderr_fd != 2)
close(new_stderr_fd);
PRINT_INFO("Spawned child process '%s' with pid '%i'", argv[0], pid);
*child_pid_ptr = pid;
return 0;