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(),
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
43
43
#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(),
44
#include <dirent.h> /* struct dirent, scandirat() */
45
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
46
FD_CLOEXEC, write(), STDOUT_FILENO,
47
struct stat, fstat(), close(),
48
setgid(), setuid(), S_ISREG(),
49
faccessat() pipe2(), fork(),
50
_exit(), dup2(), fexecve(), read()
53
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
55
#include <string.h> /* strsep, strlen(), asprintf() */
53
FD_CLOEXEC, openat(), scandirat(),
55
#include <string.h> /* strsep, strlen(), strsignal(),
56
strcmp(), strncmp() */
56
57
#include <errno.h> /* errno */
57
58
#include <argp.h> /* struct argp_option, struct
58
59
argp_state, struct argp,
62
63
#include <signal.h> /* struct sigaction, sigemptyset(),
63
64
sigaddset(), sigaction(),
64
65
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
SIG_UNBLOCK, kill() */
66
SIG_UNBLOCK, kill(), sig_atomic_t
66
68
#include <errno.h> /* errno, EBADF */
67
#include <inttypes.h> /* intmax_t, SCNdMAX, PRIdMAX, */
69
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
70
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
71
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
72
#include <errno.h> /* errno */
73
#include <error.h> /* error() */
74
#include <fnmatch.h> /* fnmatch() */
69
76
#define BUFFER_SIZE 256
71
78
#define PDIR "/lib/mandos/plugins.d"
79
#define PHDIR "/lib/mandos/plugin-helpers"
72
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
74
82
const char *argp_program_version = "plugin-runner " VERSION;
75
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
83
const char *argp_program_bug_address = "<mandos@recompile.se>";
77
85
typedef struct plugin{
78
86
char *name; /* can be NULL or any plugin name */
109
118
/* Create a new plugin */
110
plugin *new_plugin = malloc(sizeof(plugin));
119
plugin *new_plugin = NULL;
121
new_plugin = malloc(sizeof(plugin));
122
} while(new_plugin == NULL and errno == EINTR);
111
123
if(new_plugin == NULL){
114
126
char *copy_name = NULL;
115
127
if(name != NULL){
116
copy_name = strdup(name);
129
copy_name = strdup(name);
130
} while(copy_name == NULL and errno == EINTR);
117
131
if(copy_name == NULL){
122
*new_plugin = (plugin) { .name = copy_name,
125
.next = plugin_list };
139
*new_plugin = (plugin){ .name = copy_name,
142
.next = plugin_list };
127
new_plugin->argv = malloc(sizeof(char *) * 2);
145
new_plugin->argv = malloc(sizeof(char *) * 2);
146
} while(new_plugin->argv == NULL and errno == EINTR);
128
147
if(new_plugin->argv == NULL){
130
150
free(new_plugin);
133
154
new_plugin->argv[0] = copy_name;
134
155
new_plugin->argv[1] = NULL;
136
new_plugin->environ = malloc(sizeof(char *));
158
new_plugin->environ = malloc(sizeof(char *));
159
} while(new_plugin->environ == NULL and errno == EINTR);
137
160
if(new_plugin->environ == NULL){
139
163
free(new_plugin->argv);
140
164
free(new_plugin);
143
168
new_plugin->environ[0] = NULL;
203
241
return add_to_char_array(def, &(p->environ), &(p->envc));
207
246
* Based on the example in the GNU LibC manual chapter 13.13 "File
208
247
* Descriptor Flags".
209
* *Note File Descriptor Flags:(libc)Descriptor Flags.
248
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
250
__attribute__((warn_unused_result))
211
251
static int set_cloexec_flag(int fd){
212
int ret = fcntl(fd, F_GETFD, 0);
252
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
213
253
/* If reading the flags failed, return error indication now. */
217
257
/* Store modified flag word in the descriptor. */
218
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
258
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
261
#endif /* not O_CLOEXEC */
222
264
/* Mark processes as completed when they exit, and save their exit
224
266
static void handle_sigchld(__attribute__((unused)) int sig){
267
int old_errno = errno;
226
269
plugin *proc = plugin_list;
371
416
.doc = "Group ID the plugins will run as", .group = 3 },
372
417
{ .name = "debug", .key = 132,
373
418
.doc = "Debug mode", .group = 4 },
419
{ .name = "plugin-helper-dir", .key = 133,
421
.doc = "Specify a different plugin helper directory",
424
* These reproduce what we would get without ARGP_NO_HELP
426
{ .name = "help", .key = '?',
427
.doc = "Give this help list", .group = -1 },
428
{ .name = "usage", .key = -3,
429
.doc = "Give a short usage message", .group = -1 },
430
{ .name = "version", .key = 'V',
431
.doc = "Print program version", .group = -1 },
377
error_t parse_opt(int key, char *arg, __attribute__((unused))
378
struct argp_state *state) {
435
__attribute__((nonnull(3)))
436
error_t parse_opt(int key, char *arg, struct argp_state *state){
380
441
case 'g': /* --global-options */
383
while((p = strsep(&arg, ",")) != NULL){
387
if(not add_argument(getplugin(NULL), p)){
388
perror("add_argument");
389
return ARGP_ERR_UNKNOWN;
444
while((plugin_option = strsep(&arg, ",")) != NULL){
445
if(not add_argument(getplugin(NULL), plugin_option)){
394
452
case 'G': /* --global-env */
398
if(not add_environment(getplugin(NULL), arg, true)){
399
perror("add_environment");
453
if(add_environment(getplugin(NULL), arg, true)){
402
457
case 'o': /* --options-for */
404
char *p_name = strsep(&arg, ":");
405
if(p_name[0] == '\0' or arg == NULL){
408
char *opt = strsep(&arg, ":");
409
if(opt[0] == '\0' or opt == NULL){
413
while((p = strsep(&opt, ",")) != NULL){
417
if(not add_argument(getplugin(p_name), p)){
418
perror("add_argument");
419
return ARGP_ERR_UNKNOWN;
459
char *option_list = strchr(arg, ':');
460
if(option_list == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
468
argp_error(state, "Empty plugin name");
473
while((option = strsep(&option_list, ",")) != NULL){
474
if(not add_argument(getplugin(arg), option)){
424
481
case 'E': /* --env-for */
429
483
char *envdef = strchr(arg, ':');
430
484
if(envdef == NULL){
485
argp_error(state, "No colon in \"%s\"", arg);
434
if(not add_environment(getplugin(arg), envdef+1, true)){
435
perror("add_environment");
492
argp_error(state, "Empty plugin name");
496
if(add_environment(getplugin(arg), envdef, true)){
439
501
case 'd': /* --disable */
441
503
plugin *p = getplugin(arg);
443
return ARGP_ERR_UNKNOWN;
448
510
case 'e': /* --enable */
450
512
plugin *p = getplugin(arg);
452
return ARGP_ERR_UNKNOWN;
457
519
case 128: /* --plugin-dir */
459
521
plugindir = strdup(arg);
460
if(plugindir == NULL){
522
if(plugindir != NULL){
464
526
case 129: /* --config-file */
465
527
/* This is already done by parse_opt_config_file() */
467
529
case 130: /* --userid */
468
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
469
if(ret < 1 or tmpmax != (uid_t)tmpmax
470
or arg[numchars] != '\0'){
471
fprintf(stderr, "Bad user ID number: \"%s\", using %"
472
PRIdMAX "\n", arg, (intmax_t)uid);
530
tmp_id = strtoimax(arg, &tmp, 10);
531
if(errno != 0 or tmp == arg or *tmp != '\0'
532
or tmp_id != (uid_t)tmp_id){
533
argp_error(state, "Bad user ID number: \"%s\", using %"
534
PRIdMAX, arg, (intmax_t)uid);
477
540
case 131: /* --groupid */
478
ret = sscanf(arg, "%" SCNdMAX "%n", &tmpmax, &numchars);
479
if(ret < 1 or tmpmax != (gid_t)tmpmax
480
or arg[numchars] != '\0'){
481
fprintf(stderr, "Bad group ID number: \"%s\", using %"
482
PRIdMAX "\n", arg, (intmax_t)gid);
541
tmp_id = strtoimax(arg, &tmp, 10);
542
if(errno != 0 or tmp == arg or *tmp != '\0'
543
or tmp_id != (gid_t)tmp_id){
544
argp_error(state, "Bad group ID number: \"%s\", using %"
545
PRIdMAX, arg, (intmax_t)gid);
487
551
case 132: /* --debug */
554
case 133: /* --plugin-helper-dir */
555
free(pluginhelperdir);
556
pluginhelperdir = strdup(arg);
557
if(pluginhelperdir != NULL){
562
* These reproduce what we would get without ARGP_NO_HELP
564
case '?': /* --help */
565
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
566
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
567
case -3: /* --usage */
568
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
569
argp_state_help(state, state->out_stream,
570
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
571
case 'V': /* --version */
572
fprintf(state->out_stream, "%s\n", argp_program_version);
491
576
* When adding more options before this line, remember to also add a
492
577
* "case" to the "parse_opt_config_file" function below.
597
693
new_arg = strdup(p);
598
694
if(new_arg == NULL){
600
exitstatus = EXIT_FAILURE;
695
error(0, errno, "strdup");
696
exitstatus = EX_OSERR;
605
701
custom_argc += 1;
606
custom_argv = realloc(custom_argv, sizeof(char *)
607
* ((unsigned int) custom_argc + 1));
608
if(custom_argv == NULL){
610
exitstatus = EXIT_FAILURE;
703
char **new_argv = realloc(custom_argv, sizeof(char *)
704
* ((size_t)custom_argc + 1));
705
if(new_argv == NULL){
706
error(0, errno, "realloc");
707
exitstatus = EX_OSERR;
712
custom_argv = new_argv;
614
715
custom_argv[custom_argc-1] = new_arg;
615
custom_argv[custom_argc] = NULL;
716
custom_argv[custom_argc] = NULL;
720
ret = fclose(conffp);
721
} while(ret == EOF and errno == EINTR);
723
error(0, errno, "fclose");
724
exitstatus = EX_IOERR;
620
729
/* Check for harmful errors and go to fallback. Other errors might
621
730
not affect opening plugins */
622
731
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
624
exitstatus = EXIT_FAILURE;
732
error(0, errno, "fopen");
733
exitstatus = EX_OSERR;
628
/* If there was any arguments from configuration file,
629
pass them to parser as command arguments */
737
/* If there were any arguments from the configuration file, pass
738
them to parser as command line arguments */
630
739
if(custom_argv != NULL){
631
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
633
if(ret == ARGP_ERR_UNKNOWN){
634
fprintf(stderr, "Unknown error while parsing arguments\n");
635
exitstatus = EXIT_FAILURE;
740
ret = argp_parse(&argp, custom_argc, custom_argv,
741
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
749
error(0, errno, "argp_parse");
750
exitstatus = EX_OSERR;
753
exitstatus = EX_CONFIG;
640
758
/* Parse actual command line arguments, to let them override the
642
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
643
if(ret == ARGP_ERR_UNKNOWN){
644
fprintf(stderr, "Unknown error while parsing arguments\n");
645
exitstatus = EXIT_FAILURE;
760
ret = argp_parse(&argp, argc, argv,
761
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
769
error(0, errno, "argp_parse");
770
exitstatus = EX_OSERR;
773
exitstatus = EX_USAGE;
778
char *pluginhelperenv;
780
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
781
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
783
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
785
if(ret == -1 or not bret){
786
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
787
" environment variable to \"%s\" for all plugins\n",
788
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
791
free(pluginhelperenv);
663
/* Strip permissions down to nobody */
810
/* Work around Debian bug #633582:
811
<http://bugs.debian.org/633582> */
812
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
813
if(plugindir_fd == -1){
815
error(0, errno, "open(\"" PDIR "\")");
818
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
820
error(0, errno, "fstat");
822
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
823
ret = fchown(plugindir_fd, uid, gid);
825
error(0, errno, "fchown");
833
/* Lower permissions */
836
error(0, errno, "setgid");
664
838
ret = setuid(uid);
673
if(plugindir == NULL){
676
dir = opendir(plugindir);
680
perror("Could not open plugin dir");
681
exitstatus = EXIT_FAILURE;
685
/* Set the FD_CLOEXEC flag on the directory, if possible */
840
error(0, errno, "setuid");
843
/* Open plugin directory with close_on_exec flag */
687
int dir_fd = dirfd(dir);
689
ret = set_cloexec_flag(dir_fd);
691
perror("set_cloexec_flag");
692
exitstatus = EXIT_FAILURE;
845
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
848
#else /* not O_CLOEXEC */
850
#endif /* not O_CLOEXEC */
853
error(0, errno, "Could not open plugin dir");
854
exitstatus = EX_UNAVAILABLE;
859
/* Set the FD_CLOEXEC flag on the directory */
860
ret = set_cloexec_flag(dir_fd);
862
error(0, errno, "set_cloexec_flag");
863
exitstatus = EX_OSERR;
866
#endif /* O_CLOEXEC */
869
int good_name(const struct dirent * const dirent){
870
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
871
"*.dpkg-old", "*.dpkg-bak",
872
"*.dpkg-divert", NULL };
874
#pragma GCC diagnostic push
875
#pragma GCC diagnostic ignored "-Wcast-qual"
877
for(const char **pat = (const char **)patterns;
878
*pat != NULL; pat++){
880
#pragma GCC diagnostic pop
882
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
885
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
886
" matching pattern %s\n", dirent->d_name, *pat);
894
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
896
if(numplugins == -1){
897
error(0, errno, "Could not scan plugin dir");
899
exitstatus = EX_OSERR;
698
903
FD_ZERO(&rfds_all);
700
905
/* Read and execute any executable in the plugin directory*/
702
dirst = readdir(dir);
704
/* All directory entries have been processed */
708
exitstatus = EXIT_FAILURE;
714
d_name_len = strlen(dirst->d_name);
716
/* Ignore dotfiles, backup files and other junk */
718
bool bad_name = false;
720
const char const *bad_prefixes[] = { ".", "#", NULL };
722
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
725
".dpkg-divert", NULL };
726
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
727
size_t pre_len = strlen(*pre);
728
if((d_name_len >= pre_len)
729
and strncmp((dirst->d_name), *pre, pre_len) == 0){
731
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
732
" with bad prefix %s\n", dirst->d_name, *pre);
741
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
742
size_t suf_len = strlen(*suf);
743
if((d_name_len >= suf_len)
744
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
747
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
748
" with bad suffix %s\n", dirst->d_name, *suf);
761
if(plugindir == NULL){
762
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
764
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
906
for(int i = 0; i < numplugins; i++){
908
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
910
error(0, errno, "Could not open plugin");
771
ret = stat(filename, &st);
914
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
916
error(0, errno, "stat");
778
922
/* Ignore non-executable files */
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
923
if(not S_ISREG(st.st_mode)
924
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
781
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
782
" with bad type or mode\n", filename);
927
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
928
" with bad type or mode\n",
929
plugindir != NULL ? plugindir : PDIR,
930
direntries[i]->d_name);
788
plugin *p = getplugin(dirst->d_name);
937
plugin *p = getplugin(direntries[i]->d_name);
939
error(0, errno, "getplugin");
796
946
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
947
direntries[i]->d_name);
806
957
for(char **a = g->argv + 1; *a != NULL; a++){
807
958
if(not add_argument(p, *a)){
808
perror("add_argument");
959
error(0, errno, "add_argument");
811
962
/* Add global environment variables */
812
963
for(char **e = g->environ; *e != NULL; e++){
813
964
if(not add_environment(p, *e, false)){
814
perror("add_environment");
965
error(0, errno, "add_environment");
819
/* If this plugin has any environment variables, we will call
820
using execve and need to duplicate the environment from this
970
/* If this plugin has any environment variables, we need to
971
duplicate the environment from this process, too. */
822
972
if(p->environ[0] != NULL){
823
973
for(char **e = environ; *e != NULL; e++){
824
974
if(not add_environment(p, *e, false)){
825
perror("add_environment");
975
error(0, errno, "add_environment");
982
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
983
#else /* O_CLOEXEC */
984
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
985
#endif /* O_CLOEXEC */
834
exitstatus = EXIT_FAILURE;
987
error(0, errno, "pipe");
988
exitstatus = EX_OSERR;
992
if(pipefd[0] >= FD_SETSIZE){
993
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
997
exitstatus = EX_OSERR;
837
1002
/* Ask OS to automatic close the pipe on exec */
838
1003
ret = set_cloexec_flag(pipefd[0]);
840
perror("set_cloexec_flag");
841
exitstatus = EXIT_FAILURE;
1005
error(0, errno, "set_cloexec_flag");
1008
exitstatus = EX_OSERR;
1009
free(direntries[i]);
844
1012
ret = set_cloexec_flag(pipefd[1]);
846
perror("set_cloexec_flag");
847
exitstatus = EXIT_FAILURE;
1014
error(0, errno, "set_cloexec_flag");
1017
exitstatus = EX_OSERR;
1018
free(direntries[i]);
1021
#endif /* not O_CLOEXEC */
850
1022
/* Block SIGCHLD until process is safely in process list */
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1023
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1024
&sigchld_action.sa_mask,
853
perror("sigprocmask");
854
exitstatus = EXIT_FAILURE;
1027
error(0, errno, "sigprocmask");
1028
exitstatus = EX_OSERR;
1029
free(direntries[i]);
857
1032
/* Starting a new process to be watched */
1036
} while(pid == -1 and errno == EINTR);
861
exitstatus = EXIT_FAILURE;
1038
error(0, errno, "fork");
1039
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1040
&sigchld_action.sa_mask, NULL));
1043
exitstatus = EX_OSERR;
1044
free(direntries[i]);
865
1048
/* this is the child process */
866
1049
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1051
error(0, errno, "sigaction");
871
1054
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
873
perror("sigprocmask");
1056
error(0, errno, "sigprocmask");
877
1060
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1062
error(0, errno, "dup2");
884
/* If dir has no file descriptor, we could not set FD_CLOEXEC
885
above and must now close it manually here. */
888
if(p->environ[0] == NULL){
889
if(execv(filename, p->argv) < 0){
894
if(execve(filename, p->argv, p->environ) < 0){
1066
if(fexecve(plugin_fd, p->argv,
1067
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1068
error(0, errno, "fexecve for %s/%s",
1069
plugindir != NULL ? plugindir : PDIR,
1070
direntries[i]->d_name);
901
1075
/* Parent process */
902
1076
close(pipefd[1]); /* Close unused write end of pipe */
904
plugin *new_plugin = getplugin(dirst->d_name);
1078
plugin *new_plugin = getplugin(direntries[i]->d_name);
905
1079
if(new_plugin == NULL){
907
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1080
error(0, errno, "getplugin");
1081
ret = (int)(TEMP_FAILURE_RETRY
1082
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
909
perror("sigprocmask");
1085
error(0, errno, "sigprocmask");
911
exitstatus = EXIT_FAILURE;
1087
exitstatus = EX_OSERR;
1088
free(direntries[i]);
1091
free(direntries[i]);
915
1093
new_plugin->pid = pid;
916
1094
new_plugin->fd = pipefd[0];
918
1096
/* Unblock SIGCHLD so signal handler can be run if this process
919
1097
has already completed */
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1098
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1099
&sigchld_action.sa_mask,
922
perror("sigprocmask");
923
exitstatus = EXIT_FAILURE;
1102
error(0, errno, "sigprocmask");
1103
exitstatus = EX_OSERR;
949
1132
while(plugin_list){
950
1133
fd_set rfds = rfds_all;
951
1134
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
952
if(select_ret == -1){
954
exitstatus = EXIT_FAILURE;
1135
if(select_ret == -1 and errno != EINTR){
1136
error(0, errno, "select");
1137
exitstatus = EX_OSERR;
957
1140
/* OK, now either a process completed, or something can be read
958
1141
from one of them */
959
1142
for(plugin *proc = plugin_list; proc != NULL;){
960
1143
/* Is this process completely done? */
961
if(proc->eof and proc->completed){
1144
if(proc->completed and proc->eof){
962
1145
/* Only accept the plugin output if it exited cleanly */
963
1146
if(not WIFEXITED(proc->status)
964
1147
or WEXITSTATUS(proc->status) != 0){
965
1148
/* Bad exit by plugin */
968
1151
if(WIFEXITED(proc->status)){
969
fprintf(stderr, "Plugin %" PRIdMAX " exited with status"
970
" %d\n", (intmax_t) (proc->pid),
1152
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1153
" status %d\n", proc->name,
1154
(intmax_t) (proc->pid),
971
1155
WEXITSTATUS(proc->status));
972
} else if(WIFSIGNALED(proc->status)) {
973
fprintf(stderr, "Plugin %" PRIdMAX " killed by signal"
974
" %d\n", (intmax_t) (proc->pid),
975
WTERMSIG(proc->status));
1156
} else if(WIFSIGNALED(proc->status)){
1157
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1158
" signal %d: %s\n", proc->name,
1159
(intmax_t) (proc->pid),
1160
WTERMSIG(proc->status),
1161
strsignal(WTERMSIG(proc->status)));
976
1162
} else if(WCOREDUMP(proc->status)){
977
fprintf(stderr, "Plugin %" PRIdMAX " dumped core\n",
978
(intmax_t) (proc->pid));
1163
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1164
" core\n", proc->name, (intmax_t) (proc->pid));
982
1168
/* Remove the plugin */
983
1169
FD_CLR(proc->fd, &rfds_all);
985
1171
/* Block signal while modifying process_list */
986
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1172
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1174
&sigchld_action.sa_mask,
988
perror("sigprocmask");
989
exitstatus = EXIT_FAILURE;
1177
error(0, errno, "sigprocmask");
1178
exitstatus = EX_OSERR;