proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 10:12:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

start: non-functional changes

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2017-12-31 01:48:01 +01:00
parent 766a3b2ee9
commit df0795b1bd
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/lxc/start.c
View File

@ -266,35 +266,36 @@ restart:
static int setup_signal_fd(sigset_t *oldmask) static int setup_signal_fd(sigset_t *oldmask)
{ {
int ret, sig;
sigset_t mask; sigset_t mask;
int fd; int signals[] = {SIGBUS, SIGILL, SIGSEGV, SIGWINCH};
/* Block everything except serious error signals. */ /* Block everything except serious error signals. */
if (sigfillset(&mask) || ret = sigfillset(&mask);
sigdelset(&mask, SIGILL) || if (ret < 0)
sigdelset(&mask, SIGSEGV) || return -EBADF;
sigdelset(&mask, SIGBUS) ||
sigdelset(&mask, SIGWINCH) || for (sig = 0; sig < (sizeof(signals) / sizeof(signals[0])); sig++) {
sigprocmask(SIG_BLOCK, &mask, oldmask)) { ret = sigdelset(&mask, signals[sig]);
SYSERROR("Failed to set signal mask."); if (ret < 0)
return -1; return -EBADF;
} }
fd = signalfd(-1, &mask, 0); ret = sigprocmask(SIG_BLOCK, &mask, oldmask);
if (fd < 0) { if (ret < 0) {
SYSERROR("Failed to create signal file descriptor."); SYSERROR("Failed to set signal mask");
return -1; return -EBADF;
} }
if (fcntl(fd, F_SETFD, FD_CLOEXEC)) { ret = signalfd(-1, &mask, SFD_CLOEXEC);
SYSERROR("Failed to set FD_CLOEXEC on the signal file descriptor: %d.", fd); if (ret < 0) {
close(fd); SYSERROR("Failed to create signal file descriptor");
return -1; return -EBADF;
} }
DEBUG("Set SIGCHLD handler with file descriptor: %d.", fd); TRACE("Created signal file descriptor %d", ret);
return fd; return ret;
} }
static int signal_handler(int fd, uint32_t events, void *data, static int signal_handler(int fd, uint32_t events, void *data,