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

tree-wide: s/sigprocmask/pthread_sigmask()/g

Browse Source 
The behavior of sigprocmask() is unspecified in multi-threaded programs. Let's
use pthread_sigmask() instead.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-05-24 20:29:48 +02:00
parent 73b5b70eb7
commit b467714b33
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lxc/cmd/lxc_init.c
View File

@ -25,6 +25,7 @@
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <libgen.h> #include <libgen.h>
#include <pthread.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -266,7 +267,7 @@ int main(int argc, char *argv[])
if (ret < 0) if (ret < 0)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
ret = sigprocmask(SIG_SETMASK, &mask, &omask); ret = pthread_sigmask(SIG_SETMASK, &mask, &omask);
if (ret < 0) if (ret < 0)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -340,7 +341,7 @@ int main(int argc, char *argv[])
} }
} }
ret = sigprocmask(SIG_SETMASK, &omask, NULL); ret = pthread_sigmask(SIG_SETMASK, &omask, NULL);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set signal mask"); SYSERROR("Failed to set signal mask");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -368,7 +369,7 @@ int main(int argc, char *argv[])
if (ret < 0) if (ret < 0)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
ret = sigprocmask(SIG_SETMASK, &omask, NULL); ret = pthread_sigmask(SIG_SETMASK, &omask, NULL);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set signal mask"); SYSERROR("Failed to set signal mask");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

3
src/lxc/cmd/lxc_monitord.c
View File

@ -24,6 +24,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <pthread.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -386,7 +387,7 @@ int main(int argc, char *argv[])
sigdelset(&mask, SIGSEGV) || sigdelset(&mask, SIGSEGV) ||
sigdelset(&mask, SIGBUS) || sigdelset(&mask, SIGBUS) ||
sigdelset(&mask, SIGTERM) || sigdelset(&mask, SIGTERM) ||
sigprocmask(SIG_BLOCK, &mask, NULL)) { pthread_sigmask(SIG_BLOCK, &mask, NULL)) {
SYSERROR("Failed to set signal mask."); SYSERROR("Failed to set signal mask.");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }

9
src/lxc/start.c
View File

@ -32,6 +32,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <grp.h> #include <grp.h>
#include <poll.h> #include <poll.h>
#include <pthread.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -314,7 +315,7 @@ static int setup_signal_fd(sigset_t *oldmask)
return -EBADF; return -EBADF;
} }
ret = sigprocmask(SIG_BLOCK, &mask, oldmask); ret = pthread_sigmask(SIG_BLOCK, &mask, oldmask);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set signal mask"); SYSERROR("Failed to set signal mask");
return -EBADF; return -EBADF;
@ -860,7 +861,7 @@ int lxc_init(const char *name, struct lxc_handler *handler)
return 0; return 0;
out_restore_sigmask: out_restore_sigmask:
sigprocmask(SIG_SETMASK, &handler->oldmask, NULL); pthread_sigmask(SIG_SETMASK, &handler->oldmask, NULL);
out_delete_tty: out_delete_tty:
lxc_delete_tty(&conf->ttys); lxc_delete_tty(&conf->ttys);
out_aborting: out_aborting:
@ -986,7 +987,7 @@ void lxc_fini(const char *name, struct lxc_handler *handler)
} }
/* Reset mask set by setup_signal_fd. */ /* Reset mask set by setup_signal_fd. */
ret = sigprocmask(SIG_SETMASK, &handler->oldmask, NULL); ret = pthread_sigmask(SIG_SETMASK, &handler->oldmask, NULL);
if (ret < 0) if (ret < 0)
WARN("%s - Failed to restore signal mask", strerror(errno)); WARN("%s - Failed to restore signal mask", strerror(errno));
@ -1064,7 +1065,7 @@ static int do_start(void *data)
goto out_warn_father; goto out_warn_father;
} }
ret = sigprocmask(SIG_SETMASK, &handler->oldmask, NULL); ret = pthread_sigmask(SIG_SETMASK, &handler->oldmask, NULL);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set signal mask"); SYSERROR("Failed to set signal mask");
goto out_warn_father; goto out_warn_father;

7
src/lxc/terminal.c
View File

@ -24,6 +24,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <lxc/lxccontainer.h> #include <lxc/lxccontainer.h>
#include <pthread.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -172,7 +173,7 @@ struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd)
goto on_error; goto on_error;
} }
ret = sigprocmask(SIG_BLOCK, &mask, &ts->oldmask); ret = pthread_sigmask(SIG_BLOCK, &mask, &ts->oldmask);
if (ret < 0) { if (ret < 0) {
WARN("Failed to block signals"); WARN("Failed to block signals");
goto on_error; goto on_error;
@ -181,7 +182,7 @@ struct lxc_terminal_state *lxc_terminal_signal_init(int srcfd, int dstfd)
ts->sigfd = signalfd(-1, &mask, SFD_CLOEXEC); ts->sigfd = signalfd(-1, &mask, SFD_CLOEXEC);
if (ts->sigfd < 0) { if (ts->sigfd < 0) {
WARN("Failed to create signal fd"); WARN("Failed to create signal fd");
sigprocmask(SIG_SETMASK, &ts->oldmask, NULL); (void)pthread_sigmask(SIG_SETMASK, &ts->oldmask, NULL);
goto on_error; goto on_error;
} }
@ -206,7 +207,7 @@ void lxc_terminal_signal_fini(struct lxc_terminal_state *ts)
if (ts->sigfd >= 0) { if (ts->sigfd >= 0) {
close(ts->sigfd); close(ts->sigfd);
if (sigprocmask(SIG_SETMASK, &ts->oldmask, NULL) < 0) if (pthread_sigmask(SIG_SETMASK, &ts->oldmask, NULL) < 0)
WARN("%s - Failed to restore signal mask", strerror(errno)); WARN("%s - Failed to restore signal mask", strerror(errno));
} }

3
src/lxc/utils.c
View File

@ -31,6 +31,7 @@
#include <grp.h> #include <grp.h>
#include <inttypes.h> #include <inttypes.h>
#include <libgen.h> #include <libgen.h>
#include <pthread.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -495,7 +496,7 @@ struct lxc_popen_FILE *lxc_popen(const char *command)
if (ret < 0) if (ret < 0)
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
ret = sigprocmask(SIG_UNBLOCK, &mask, NULL); ret = pthread_sigmask(SIG_UNBLOCK, &mask, NULL);
if (ret < 0) if (ret < 0)
_exit(EXIT_FAILURE); _exit(EXIT_FAILURE);