19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
27
27
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
30
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
34
WIFEXITED(), WEXITSTATUS(), wait(),
35
pid_t, uid_t, gid_t, getuid(),
38
37
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
38
FD_SET(), FD_ISSET(), FD_CLR */
40
39
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
40
WEXITSTATUS(), WTERMSIG() */
41
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
42
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
readdir(), closedir(), dirfd() */
46
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
fcntl(), setuid(), setgid(),
48
F_GETFD, F_SETFD, FD_CLOEXEC,
49
access(), pipe(), fork(), close()
50
dup2(), STDOUT_FILENO, _exit(),
51
execv(), write(), read(),
43
#include <dirent.h> /* struct dirent, scandirat() */
44
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
45
FD_CLOEXEC, write(), STDOUT_FILENO,
46
struct stat, fstat(), close(),
47
setgid(), setuid(), S_ISREG(),
48
faccessat() pipe2(), fork(),
49
_exit(), dup2(), fexecve(), read()
53
51
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
#include <string.h> /* strsep, strlen(), asprintf() */
52
FD_CLOEXEC, openat(), scandirat(),
54
#include <string.h> /* strsep, strlen(), strsignal(),
55
strcmp(), strncmp() */
56
56
#include <errno.h> /* errno */
57
57
#include <argp.h> /* struct argp_option, struct
58
58
argp_state, struct argp,
62
62
#include <signal.h> /* struct sigaction, sigemptyset(),
63
63
sigaddset(), sigaction(),
64
64
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
SIG_UNBLOCK, kill() */
65
SIG_UNBLOCK, kill(), sig_atomic_t
66
67
#include <errno.h> /* errno, EBADF */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
68
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
69
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
70
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
71
#include <errno.h> /* errno */
72
#include <error.h> /* error() */
73
#include <fnmatch.h> /* fnmatch() */
69
75
#define BUFFER_SIZE 256
71
77
#define PDIR "/lib/mandos/plugins.d"
78
#define PHDIR "/lib/mandos/plugin-helpers"
72
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
74
81
const char *argp_program_version = "plugin-runner " VERSION;
75
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
77
84
typedef struct plugin{
78
85
char *name; /* can be NULL or any plugin name */
204
240
return add_to_char_array(def, &(p->environ), &(p->envc));
208
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
209
246
* Descriptor Flags".
210
* *Note File Descriptor Flags:(libc)Descriptor Flags.
247
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
249
__attribute__((warn_unused_result))
212
250
static int set_cloexec_flag(int fd){
213
int ret = fcntl(fd, F_GETFD, 0);
251
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
214
252
/* If reading the flags failed, return error indication now. */
218
256
/* Store modified flag word in the descriptor. */
219
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
260
#endif /* not O_CLOEXEC */
223
263
/* Mark processes as completed when they exit, and save their exit
225
265
static void handle_sigchld(__attribute__((unused)) int sig){
266
int old_errno = errno;
227
268
plugin *proc = plugin_list;
372
415
.doc = "Group ID the plugins will run as", .group = 3 },
373
416
{ .name = "debug", .key = 132,
374
417
.doc = "Debug mode", .group = 4 },
418
{ .name = "plugin-helper-dir", .key = 133,
420
.doc = "Specify a different plugin helper directory",
423
* These reproduce what we would get without ARGP_NO_HELP
425
{ .name = "help", .key = '?',
426
.doc = "Give this help list", .group = -1 },
427
{ .name = "usage", .key = -3,
428
.doc = "Give a short usage message", .group = -1 },
429
{ .name = "version", .key = 'V',
430
.doc = "Print program version", .group = -1 },
378
error_t parse_opt(int key, char *arg, __attribute__((unused))
379
struct argp_state *state){
434
__attribute__((nonnull(3)))
435
error_t parse_opt(int key, char *arg, struct argp_state *state){
381
440
case 'g': /* --global-options */
384
while((p = strsep(&arg, ",")) != NULL){
388
if(not add_argument(getplugin(NULL), p)){
389
perror("add_argument");
390
return ARGP_ERR_UNKNOWN;
443
while((plugin_option = strsep(&arg, ",")) != NULL){
444
if(not add_argument(getplugin(NULL), plugin_option)){
395
451
case 'G': /* --global-env */
399
if(not add_environment(getplugin(NULL), arg, true)){
400
perror("add_environment");
452
if(add_environment(getplugin(NULL), arg, true)){
403
456
case 'o': /* --options-for */
405
char *p_name = strsep(&arg, ":");
406
if(p_name[0] == '\0' or arg == NULL){
409
char *opt = strsep(&arg, ":");
410
if(opt[0] == '\0' or opt == NULL){
414
while((p = strsep(&opt, ",")) != NULL){
418
if(not add_argument(getplugin(p_name), p)){
419
perror("add_argument");
420
return ARGP_ERR_UNKNOWN;
458
char *option_list = strchr(arg, ':');
459
if(option_list == NULL){
460
argp_error(state, "No colon in \"%s\"", arg);
467
argp_error(state, "Empty plugin name");
472
while((option = strsep(&option_list, ",")) != NULL){
473
if(not add_argument(getplugin(arg), option)){
425
480
case 'E': /* --env-for */
430
482
char *envdef = strchr(arg, ':');
431
483
if(envdef == NULL){
484
argp_error(state, "No colon in \"%s\"", arg);
435
if(not add_environment(getplugin(arg), envdef+1, true)){
436
perror("add_environment");
491
argp_error(state, "Empty plugin name");
495
if(add_environment(getplugin(arg), envdef, true)){
440
500
case 'd': /* --disable */
442
502
plugin *p = getplugin(arg);
444
return ARGP_ERR_UNKNOWN;
449
509
case 'e': /* --enable */
451
511
plugin *p = getplugin(arg);
453
return ARGP_ERR_UNKNOWN;
458
518
case 128: /* --plugin-dir */
460
520
plugindir = strdup(arg);
461
if(plugindir == NULL){
521
if(plugindir != NULL){
465
525
case 129: /* --config-file */
466
526
/* This is already done by parse_opt_config_file() */
468
528
case 130: /* --userid */
469
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
470
if(ret < 1 or tmpmax != (uid_t)tmpmax
471
or arg[numchars] != '\0'){
472
fprintf(stderr, "Bad user ID number: \"%s\", using %"
473
PRIdMAX "\n", arg, (intmax_t)uid);
529
tmp_id = strtoimax(arg, &tmp, 10);
530
if(errno != 0 or tmp == arg or *tmp != '\0'
531
or tmp_id != (uid_t)tmp_id){
532
argp_error(state, "Bad user ID number: \"%s\", using %"
533
PRIdMAX, arg, (intmax_t)uid);
478
539
case 131: /* --groupid */
479
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
480
if(ret < 1 or tmpmax != (gid_t)tmpmax
481
or arg[numchars] != '\0'){
482
fprintf(stderr, "Bad group ID number: \"%s\", using %"
483
PRIdMAX "\n", arg, (intmax_t)gid);
540
tmp_id = strtoimax(arg, &tmp, 10);
541
if(errno != 0 or tmp == arg or *tmp != '\0'
542
or tmp_id != (gid_t)tmp_id){
543
argp_error(state, "Bad group ID number: \"%s\", using %"
544
PRIdMAX, arg, (intmax_t)gid);
488
550
case 132: /* --debug */
553
case 133: /* --plugin-helper-dir */
554
free(pluginhelperdir);
555
pluginhelperdir = strdup(arg);
556
if(pluginhelperdir != NULL){
561
* These reproduce what we would get without ARGP_NO_HELP
563
case '?': /* --help */
564
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
565
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
566
case -3: /* --usage */
567
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
568
argp_state_help(state, state->out_stream,
569
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
570
case 'V': /* --version */
571
fprintf(state->out_stream, "%s\n", argp_program_version);
492
575
* When adding more options before this line, remember to also add a
493
576
* "case" to the "parse_opt_config_file" function below.
598
692
new_arg = strdup(p);
599
693
if(new_arg == NULL){
601
exitstatus = EXIT_FAILURE;
694
error(0, errno, "strdup");
695
exitstatus = EX_OSERR;
606
700
custom_argc += 1;
607
custom_argv = realloc(custom_argv, sizeof(char *)
608
* ((unsigned int) custom_argc + 1));
609
if(custom_argv == NULL){
611
exitstatus = EXIT_FAILURE;
702
char **new_argv = realloc(custom_argv, sizeof(char *)
703
* ((size_t)custom_argc + 1));
704
if(new_argv == NULL){
705
error(0, errno, "realloc");
706
exitstatus = EX_OSERR;
711
custom_argv = new_argv;
615
714
custom_argv[custom_argc-1] = new_arg;
616
custom_argv[custom_argc] = NULL;
715
custom_argv[custom_argc] = NULL;
719
ret = fclose(conffp);
720
} while(ret == EOF and errno == EINTR);
722
error(0, errno, "fclose");
723
exitstatus = EX_IOERR;
621
728
/* Check for harmful errors and go to fallback. Other errors might
622
729
not affect opening plugins */
623
730
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
625
exitstatus = EXIT_FAILURE;
731
error(0, errno, "fopen");
732
exitstatus = EX_OSERR;
629
/* If there was any arguments from configuration file,
630
pass them to parser as command arguments */
736
/* If there were any arguments from the configuration file, pass
737
them to parser as command line arguments */
631
738
if(custom_argv != NULL){
632
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
634
if(ret == ARGP_ERR_UNKNOWN){
635
fprintf(stderr, "Unknown error while parsing arguments\n");
636
exitstatus = EXIT_FAILURE;
739
ret = argp_parse(&argp, custom_argc, custom_argv,
740
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
748
error(0, errno, "argp_parse");
749
exitstatus = EX_OSERR;
752
exitstatus = EX_CONFIG;
641
757
/* Parse actual command line arguments, to let them override the
643
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
644
if(ret == ARGP_ERR_UNKNOWN){
645
fprintf(stderr, "Unknown error while parsing arguments\n");
646
exitstatus = EXIT_FAILURE;
759
ret = argp_parse(&argp, argc, argv,
760
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
768
error(0, errno, "argp_parse");
769
exitstatus = EX_OSERR;
772
exitstatus = EX_USAGE;
777
char *pluginhelperenv;
779
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
780
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
782
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
784
if(ret == -1 or not bret){
785
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
786
" environment variable to \"%s\" for all plugins\n",
787
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
790
free(pluginhelperenv);
651
for(plugin *p = plugin_list; p != NULL; p=p->next){
795
for(plugin *p = plugin_list; p != NULL; p = p->next){
652
796
fprintf(stderr, "Plugin: %s has %d arguments\n",
653
797
p->name ? p->name : "Global", p->argc - 1);
654
798
for(char **a = p->argv; *a != NULL; a++){
664
/* Strip permissions down to nobody */
809
/* Work around Debian bug #633582:
810
<https://bugs.debian.org/633582> */
811
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
812
if(plugindir_fd == -1){
814
error(0, errno, "open(\"" PDIR "\")");
817
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
819
error(0, errno, "fstat");
821
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
822
ret = fchown(plugindir_fd, uid, gid);
824
error(0, errno, "fchown");
832
/* Lower permissions */
835
error(0, errno, "setgid");
665
837
ret = setuid(uid);
674
if(plugindir == NULL){
677
dir = opendir(plugindir);
681
perror("Could not open plugin dir");
682
exitstatus = EXIT_FAILURE;
686
/* Set the FD_CLOEXEC flag on the directory, if possible */
839
error(0, errno, "setuid");
842
/* Open plugin directory with close_on_exec flag */
688
int dir_fd = dirfd(dir);
690
ret = set_cloexec_flag(dir_fd);
692
perror("set_cloexec_flag");
693
exitstatus = EXIT_FAILURE;
844
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
847
#else /* not O_CLOEXEC */
849
#endif /* not O_CLOEXEC */
852
error(0, errno, "Could not open plugin dir");
853
exitstatus = EX_UNAVAILABLE;
858
/* Set the FD_CLOEXEC flag on the directory */
859
ret = set_cloexec_flag(dir_fd);
861
error(0, errno, "set_cloexec_flag");
862
exitstatus = EX_OSERR;
865
#endif /* O_CLOEXEC */
868
int good_name(const struct dirent * const dirent){
869
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
870
"*.dpkg-old", "*.dpkg-bak",
871
"*.dpkg-divert", NULL };
873
#pragma GCC diagnostic push
874
#pragma GCC diagnostic ignored "-Wcast-qual"
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
879
#pragma GCC diagnostic pop
881
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
885
" matching pattern %s\n", dirent->d_name, *pat);
893
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
895
if(numplugins == -1){
896
error(0, errno, "Could not scan plugin dir");
898
exitstatus = EX_OSERR;
699
902
FD_ZERO(&rfds_all);
701
904
/* Read and execute any executable in the plugin directory*/
703
dirst = readdir(dir);
705
/* All directory entries have been processed */
709
exitstatus = EXIT_FAILURE;
715
d_name_len = strlen(dirst->d_name);
717
/* Ignore dotfiles, backup files and other junk */
719
bool bad_name = false;
721
const char const *bad_prefixes[] = { ".", "#", NULL };
723
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
726
".dpkg-divert", NULL };
727
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
728
size_t pre_len = strlen(*pre);
729
if((d_name_len >= pre_len)
730
and strncmp((dirst->d_name), *pre, pre_len) == 0){
732
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
733
" with bad prefix %s\n", dirst->d_name, *pre);
742
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
743
size_t suf_len = strlen(*suf);
744
if((d_name_len >= suf_len)
745
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
748
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
749
" with bad suffix %s\n", dirst->d_name, *suf);
762
if(plugindir == NULL){
763
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
765
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
905
for(int i = 0; i < numplugins; i++){
907
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
909
error(0, errno, "Could not open plugin");
772
ret = stat(filename, &st);
913
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
915
error(0, errno, "stat");
779
921
/* Ignore non-executable files */
780
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
922
if(not S_ISREG(st.st_mode)
923
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
782
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
783
" with bad type or mode\n", filename);
926
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
927
" with bad type or mode\n",
928
plugindir != NULL ? plugindir : PDIR,
929
direntries[i]->d_name);
789
plugin *p = getplugin(dirst->d_name);
936
plugin *p = getplugin(direntries[i]->d_name);
938
error(0, errno, "getplugin");
797
945
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
946
direntries[i]->d_name);
807
956
for(char **a = g->argv + 1; *a != NULL; a++){
808
957
if(not add_argument(p, *a)){
809
perror("add_argument");
958
error(0, errno, "add_argument");
812
961
/* Add global environment variables */
813
962
for(char **e = g->environ; *e != NULL; e++){
814
963
if(not add_environment(p, *e, false)){
815
perror("add_environment");
964
error(0, errno, "add_environment");
820
/* If this plugin has any environment variables, we will call
821
using execve and need to duplicate the environment from this
969
/* If this plugin has any environment variables, we need to
970
duplicate the environment from this process, too. */
823
971
if(p->environ[0] != NULL){
824
972
for(char **e = environ; *e != NULL; e++){
825
973
if(not add_environment(p, *e, false)){
826
perror("add_environment");
974
error(0, errno, "add_environment");
981
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
982
#else /* O_CLOEXEC */
983
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
984
#endif /* O_CLOEXEC */
835
exitstatus = EXIT_FAILURE;
986
error(0, errno, "pipe");
987
exitstatus = EX_OSERR;
991
if(pipefd[0] >= FD_SETSIZE){
992
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
996
exitstatus = EX_OSERR;
838
1001
/* Ask OS to automatic close the pipe on exec */
839
1002
ret = set_cloexec_flag(pipefd[0]);
841
perror("set_cloexec_flag");
842
exitstatus = EXIT_FAILURE;
1004
error(0, errno, "set_cloexec_flag");
1007
exitstatus = EX_OSERR;
1008
free(direntries[i]);
845
1011
ret = set_cloexec_flag(pipefd[1]);
847
perror("set_cloexec_flag");
848
exitstatus = EXIT_FAILURE;
1013
error(0, errno, "set_cloexec_flag");
1016
exitstatus = EX_OSERR;
1017
free(direntries[i]);
1020
#endif /* not O_CLOEXEC */
851
1021
/* Block SIGCHLD until process is safely in process list */
852
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1022
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1023
&sigchld_action.sa_mask,
854
perror("sigprocmask");
855
exitstatus = EXIT_FAILURE;
1026
error(0, errno, "sigprocmask");
1027
exitstatus = EX_OSERR;
1028
free(direntries[i]);
858
1031
/* Starting a new process to be watched */
1035
} while(pid == -1 and errno == EINTR);
862
exitstatus = EXIT_FAILURE;
1037
error(0, errno, "fork");
1038
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1039
&sigchld_action.sa_mask, NULL));
1042
exitstatus = EX_OSERR;
1043
free(direntries[i]);
866
1047
/* this is the child process */
867
1048
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1050
error(0, errno, "sigaction");
872
1053
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
874
perror("sigprocmask");
1055
error(0, errno, "sigprocmask");
878
1059
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1061
error(0, errno, "dup2");
885
/* If dir has no file descriptor, we could not set FD_CLOEXEC
886
above and must now close it manually here. */
889
if(p->environ[0] == NULL){
890
if(execv(filename, p->argv) < 0){
895
if(execve(filename, p->argv, p->environ) < 0){
1065
if(fexecve(plugin_fd, p->argv,
1066
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1067
error(0, errno, "fexecve for %s/%s",
1068
plugindir != NULL ? plugindir : PDIR,
1069
direntries[i]->d_name);
902
1074
/* Parent process */
903
1075
close(pipefd[1]); /* Close unused write end of pipe */
905
plugin *new_plugin = getplugin(dirst->d_name);
1077
plugin *new_plugin = getplugin(direntries[i]->d_name);
906
1078
if(new_plugin == NULL){
908
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1079
error(0, errno, "getplugin");
1080
ret = (int)(TEMP_FAILURE_RETRY
1081
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
910
perror("sigprocmask");
1084
error(0, errno, "sigprocmask");
912
exitstatus = EXIT_FAILURE;
1086
exitstatus = EX_OSERR;
1087
free(direntries[i]);
1090
free(direntries[i]);
916
1092
new_plugin->pid = pid;
917
1093
new_plugin->fd = pipefd[0];
919
1095
/* Unblock SIGCHLD so signal handler can be run if this process
920
1096
has already completed */
921
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1097
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1098
&sigchld_action.sa_mask,
923
perror("sigprocmask");
924
exitstatus = EXIT_FAILURE;
1101
error(0, errno, "sigprocmask");
1102
exitstatus = EX_OSERR;
964
1145
if(not WIFEXITED(proc->status)
965
1146
or WEXITSTATUS(proc->status) != 0){
966
1147
/* Bad exit by plugin */
969
1150
if(WIFEXITED(proc->status)){
970
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
971
" %d\n", (intmax_t) (proc->pid),
1151
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1152
" status %d\n", proc->name,
1153
(intmax_t) (proc->pid),
972
1154
WEXITSTATUS(proc->status));
973
1155
} else if(WIFSIGNALED(proc->status)){
974
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
975
" %d\n", (intmax_t) (proc->pid),
976
WTERMSIG(proc->status));
977
} else if(WCOREDUMP(proc->status)){
978
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
979
(intmax_t) (proc->pid));
1156
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1157
" signal %d: %s\n", proc->name,
1158
(intmax_t) (proc->pid),
1159
WTERMSIG(proc->status),
1160
strsignal(WTERMSIG(proc->status)));
983
1164
/* Remove the plugin */
984
1165
FD_CLR(proc->fd, &rfds_all);
986
1167
/* Block signal while modifying process_list */
987
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1170
&sigchld_action.sa_mask,
989
perror("sigprocmask");
990
exitstatus = EXIT_FAILURE;
1173
error(0, errno, "sigprocmask");
1174
exitstatus = EX_OSERR;