proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 05:33:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

terminal: error out when SIGTERM cannot be added

Browse Source 
This should be an error condition.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-28 11:51:21 +01:00
parent e62912bdbc
commit b6d5de95f9
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/lxc/terminal.c
View File

@ -133,7 +133,7 @@ int lxc_terminal_signalfd_cb(int fd, uint32_t events, void *cbdata,
struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd) struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd)
{ {
int ret; int ret;
bool istty; bool istty = false;
sigset_t mask; sigset_t mask;
struct lxc_terminal_state *ts; struct lxc_terminal_state *ts;
@ -146,20 +146,31 @@ struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd)
ts->masterfd = dstfd; ts->masterfd = dstfd;
ts->sigfd = -1; ts->sigfd = -1;
sigemptyset(&mask); ret = sigemptyset(&mask);
if (ret < 0) {
SYSERROR("Failed to initialize an empty signal set");
goto on_error;
}
istty = isatty(srcfd) == 1; istty = (isatty(srcfd) == 1);
if (!istty) { if (!istty) {
INFO("fd %d does not refer to a tty device", srcfd); INFO("fd %d does not refer to a tty device", srcfd);
} else { } else {
/* Add tty to list to be scanned at SIGWINCH time. */ /* Add tty to list to be scanned at SIGWINCH time. */
lxc_list_add_elem(&ts->node, ts); lxc_list_add_elem(&ts->node, ts);
lxc_list_add_tail(&lxc_ttys, &ts->node); lxc_list_add_tail(&lxc_ttys, &ts->node);
sigaddset(&mask, SIGWINCH); ret = sigaddset(&mask, SIGWINCH);
if (ret < 0)
NOTICE("%s - Failed to add SIGWINCH to signal set",
strerror(errno));
} }
/* Exit the mainloop cleanly on SIGTERM. */ /* Exit the mainloop cleanly on SIGTERM. */
sigaddset(&mask, SIGTERM); ret = sigaddset(&mask, SIGTERM);
if (ret < 0) {
SYSERROR("Failed to add SIGWINCH to signal set");
goto on_error;
}
ret = sigprocmask(SIG_BLOCK, &mask, &ts->oldmask); ret = sigprocmask(SIG_BLOCK, &mask, &ts->oldmask);
if (ret < 0) { if (ret < 0) {
@ -183,8 +194,10 @@ on_error:
close(ts->sigfd); close(ts->sigfd);
ts->sigfd = -1; ts->sigfd = -1;
} }
if (istty) if (istty)
lxc_list_del(&ts->node); lxc_list_del(&ts->node);
return ts; return ts;
} }