To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 395
- compare with another revision
- download diff
- download tarball
- view history from revision 395
- Committer: Teddy Hogeborn
- Date: 2009-10-26 21:16:16 UTC
- Revision ID: teddy@fukt.bsnet.se-20091026211616-38e9wynf4428ip2l
Merge from release branch.
- files modified:
- Makefile
added
removed
plugin-runner.c
1
/* -*- coding: utf-8 -*- */
1
/* -*- coding: utf-8; mode: c; mode: orgtbl -*- */
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf() */
26
asprintf(), O_CLOEXEC */
27
27
#include <stddef.h> /* size_t, NULL */
28
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
29
EXIT_SUCCESS, realloc() */
30
30
#include <stdbool.h> /* bool, true, false */
31
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
42
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
45
46
readdir(), closedir(), dirfd() */
46
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
48
fcntl(), setuid(), setgid(),
52
53
close() */
53
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
55
FD_CLOEXEC */
55
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal() */
56
58
#include <errno.h> /* errno */
57
59
#include <argp.h> /* struct argp_option, struct
58
60
argp_state, struct argp,
66
68
*/
67
69
#include <errno.h> /* errno, EBADF */
68
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE */
69
72
70
73
#define BUFFER_SIZE 256
71
74
100
103
/* Gets an existing plugin based on name,
101
104
or if none is found, creates a new one */
102
105
static plugin *getplugin(char *name){
103
/* Check for exiting plugin with that name */
106
/* Check for existing plugin with that name */
104
107
for(plugin *p = plugin_list; p != NULL; p = p->next){
105
108
if((p->name == name)
106
109
or (p->name and name and (strcmp(p->name, name) == 0))){
108
111
}
109
112
}
110
113
/* Create a new plugin */
111
plugin *new_plugin = malloc(sizeof(plugin));
114
plugin *new_plugin = NULL;
115
do {
116
new_plugin = malloc(sizeof(plugin));
117
} while(new_plugin == NULL and errno == EINTR);
112
118
if(new_plugin == NULL){
113
119
return NULL;
114
120
}
115
121
char *copy_name = NULL;
116
122
if(name != NULL){
117
copy_name = strdup(name);
123
do {
124
copy_name = strdup(name);
125
} while(copy_name == NULL and errno == EINTR);
118
126
if(copy_name == NULL){
127
int e = errno;
119
128
free(new_plugin);
129
errno = e;
120
130
return NULL;
121
131
}
122
132
}
126
136
.disabled = false,
127
137
.next = plugin_list };
128
138
129
new_plugin->argv = malloc(sizeof(char *) * 2);
139
do {
140
new_plugin->argv = malloc(sizeof(char *) * 2);
141
} while(new_plugin->argv == NULL and errno == EINTR);
130
142
if(new_plugin->argv == NULL){
143
int e = errno;
131
144
free(copy_name);
132
145
free(new_plugin);
146
errno = e;
133
147
return NULL;
134
148
}
135
149
new_plugin->argv[0] = copy_name;
136
150
new_plugin->argv[1] = NULL;
137
151
138
new_plugin->environ = malloc(sizeof(char *));
152
do {
153
new_plugin->environ = malloc(sizeof(char *));
154
} while(new_plugin->environ == NULL and errno == EINTR);
139
155
if(new_plugin->environ == NULL){
156
int e = errno;
140
157
free(copy_name);
141
158
free(new_plugin->argv);
142
159
free(new_plugin);
160
errno = e;
143
161
return NULL;
144
162
}
145
163
new_plugin->environ[0] = NULL;
153
171
static bool add_to_char_array(const char *new, char ***array,
154
172
int *len){
155
173
/* Resize the pointed-to array to hold one more pointer */
156
*array = realloc(*array, sizeof(char *)
157
* (size_t) ((*len) + 2));
174
do {
175
*array = realloc(*array, sizeof(char *)
176
* (size_t) ((*len) + 2));
177
} while(*array == NULL and errno == EINTR);
158
178
/* Malloc check */
159
179
if(*array == NULL){
160
180
return false;
161
181
}
162
182
/* Make a copy of the new string */
163
char *copy = strdup(new);
183
char *copy;
184
do {
185
copy = strdup(new);
186
} while(copy == NULL and errno == EINTR);
164
187
if(copy == NULL){
165
188
return false;
166
189
}
192
215
if(strncmp(*e, def, namelen + 1) == 0){
193
216
/* It already exists */
194
217
if(replace){
195
char *new = realloc(*e, strlen(def) + 1);
218
char *new;
219
do {
220
new = realloc(*e, strlen(def) + 1);
221
} while(new == NULL and errno == EINTR);
196
222
if(new == NULL){
197
223
return false;
198
224
}
208
234
/*
209
235
* Based on the example in the GNU LibC manual chapter 13.13 "File
210
236
* Descriptor Flags".
211
* *Note File Descriptor Flags:(libc)Descriptor Flags.
237
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
212
238
*/
213
239
static int set_cloexec_flag(int fd){
214
int ret = fcntl(fd, F_GETFD, 0);
240
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
215
241
/* If reading the flags failed, return error indication now. */
216
242
if(ret < 0){
217
243
return ret;
218
244
}
219
245
/* Store modified flag word in the descriptor. */
220
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
246
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
247
ret | FD_CLOEXEC));
221
248
}
222
249
223
250
315
342
fd_set rfds_all;
316
343
int ret, maxfd = 0;
317
344
ssize_t sret;
318
intmax_t tmpmax;
319
345
uid_t uid = 65534;
320
346
gid_t gid = 65534;
321
347
bool debug = false;
375
401
.doc = "Group ID the plugins will run as", .group = 3 },
376
402
{ .name = "debug", .key = 132,
377
403
.doc = "Debug mode", .group = 4 },
404
/*
405
* These reproduce what we would get without ARGP_NO_HELP
406
*/
407
{ .name = "help", .key = '?',
408
.doc = "Give this help list", .group = -1 },
409
{ .name = "usage", .key = -3,
410
.doc = "Give a short usage message", .group = -1 },
411
{ .name = "version", .key = 'V',
412
.doc = "Print program version", .group = -1 },
378
413
{ .name = NULL }
379
414
};
380
415
381
error_t parse_opt(int key, char *arg, __attribute__((unused))
382
struct argp_state *state){
383
char *tmp;
416
error_t parse_opt(int key, char *arg, struct argp_state *state){
417
errno = 0;
384
418
switch(key){
419
char *tmp;
420
intmax_t tmpmax;
385
421
case 'g': /* --global-options */
386
if(arg != NULL){
422
{
387
423
char *plugin_option;
388
424
while((plugin_option = strsep(&arg, ",")) != NULL){
389
if(plugin_option[0] == '\0'){
390
continue;
391
}
392
425
if(not add_argument(getplugin(NULL), plugin_option)){
393
perror("add_argument");
394
return ARGP_ERR_UNKNOWN;
426
break;
395
427
}
396
428
}
397
429
}
398
430
break;
399
431
case 'G': /* --global-env */
400
if(arg == NULL){
401
break;
402
}
403
if(not add_environment(getplugin(NULL), arg, true)){
404
perror("add_environment");
405
}
432
add_environment(getplugin(NULL), arg, true);
406
433
break;
407
434
case 'o': /* --options-for */
408
if(arg != NULL){
409
char *plugin_name = strsep(&arg, ":");
410
if(plugin_name[0] == '\0'){
411
break;
412
}
413
char *plugin_option;
414
while((plugin_option = strsep(&arg, ",")) != NULL){
415
if(not add_argument(getplugin(plugin_name), plugin_option)){
416
perror("add_argument");
417
return ARGP_ERR_UNKNOWN;
435
{
436
char *option_list = strchr(arg, ':');
437
if(option_list == NULL){
438
argp_error(state, "No colon in \"%s\"", arg);
439
errno = EINVAL;
440
break;
441
}
442
*option_list = '\0';
443
option_list++;
444
if(arg[0] == '\0'){
445
argp_error(state, "Empty plugin name");
446
errno = EINVAL;
447
break;
448
}
449
char *option;
450
while((option = strsep(&option_list, ",")) != NULL){
451
if(not add_argument(getplugin(arg), option)){
452
break;
418
453
}
419
454
}
420
455
}
421
456
break;
422
457
case 'E': /* --env-for */
423
if(arg == NULL){
424
break;
425
}
426
458
{
427
459
char *envdef = strchr(arg, ':');
428
460
if(envdef == NULL){
461
argp_error(state, "No colon in \"%s\"", arg);
462
errno = EINVAL;
429
463
break;
430
464
}
431
465
*envdef = '\0';
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
466
envdef++;
467
if(arg[0] == '\0'){
468
argp_error(state, "Empty plugin name");
469
errno = EINVAL;
470
break;
434
471
}
472
add_environment(getplugin(arg), envdef, true);
435
473
}
436
474
break;
437
475
case 'd': /* --disable */
438
if(arg != NULL){
476
{
439
477
plugin *p = getplugin(arg);
440
if(p == NULL){
441
return ARGP_ERR_UNKNOWN;
478
if(p != NULL){
479
p->disabled = true;
442
480
}
443
p->disabled = true;
444
481
}
445
482
break;
446
483
case 'e': /* --enable */
447
if(arg != NULL){
484
{
448
485
plugin *p = getplugin(arg);
449
if(p == NULL){
450
return ARGP_ERR_UNKNOWN;
486
if(p != NULL){
487
p->disabled = false;
451
488
}
452
p->disabled = false;
453
489
}
454
490
break;
455
491
case 128: /* --plugin-dir */
456
492
free(plugindir);
457
493
plugindir = strdup(arg);
458
if(plugindir == NULL){
459
perror("strdup");
460
}
461
494
break;
462
495
case 129: /* --config-file */
463
496
/* This is already done by parse_opt_config_file() */
464
497
break;
465
498
case 130: /* --userid */
466
errno = 0;
467
499
tmpmax = strtoimax(arg, &tmp, 10);
468
500
if(errno != 0 or tmp == arg or *tmp != '\0'
469
501
or tmpmax != (uid_t)tmpmax){
470
fprintf(stderr, "Bad user ID number: \"%s\", using %"
471
PRIdMAX "\n", arg, (intmax_t)uid);
472
} else {
473
uid = (uid_t)tmpmax;
502
argp_error(state, "Bad user ID number: \"%s\", using %"
503
PRIdMAX, arg, (intmax_t)uid);
504
break;
474
505
}
506
uid = (uid_t)tmpmax;
475
507
break;
476
508
case 131: /* --groupid */
477
errno = 0;
478
509
tmpmax = strtoimax(arg, &tmp, 10);
479
510
if(errno != 0 or tmp == arg or *tmp != '\0'
480
511
or tmpmax != (gid_t)tmpmax){
481
fprintf(stderr, "Bad group ID number: \"%s\", using %"
482
PRIdMAX "\n", arg, (intmax_t)gid);
483
} else {
484
gid = (gid_t)tmpmax;
512
argp_error(state, "Bad group ID number: \"%s\", using %"
513
PRIdMAX, arg, (intmax_t)gid);
514
break;
485
515
}
516
gid = (gid_t)tmpmax;
486
517
break;
487
518
case 132: /* --debug */
488
519
debug = true;
489
520
break;
521
/*
522
* These reproduce what we would get without ARGP_NO_HELP
523
*/
524
case '?': /* --help */
525
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
526
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
527
case -3: /* --usage */
528
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
529
argp_state_help(state, state->out_stream,
530
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
531
case 'V': /* --version */
532
fprintf(state->out_stream, "%s\n", argp_program_version);
533
exit(EXIT_SUCCESS);
534
break;
490
535
/*
491
536
* When adding more options before this line, remember to also add a
492
537
* "case" to the "parse_opt_config_file" function below.
495
540
/* Cryptsetup always passes an argument, which is an empty
496
541
string if "none" was specified in /etc/crypttab. So if
497
542
argument was empty, we ignore it silently. */
498
if(arg[0] != '\0'){
499
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
543
if(arg[0] == '\0'){
544
break;
500
545
}
501
break;
502
case ARGP_KEY_END:
503
break;
504
546
default:
505
547
return ARGP_ERR_UNKNOWN;
506
548
}
507
return 0;
549
return errno; /* Set to 0 at start */
508
550
}
509
551
510
552
/* This option parser is the same as parse_opt() above, except it
512
554
error_t parse_opt_config_file(int key, char *arg,
513
555
__attribute__((unused))
514
556
struct argp_state *state){
557
errno = 0;
515
558
switch(key){
516
559
case 'g': /* --global-options */
517
560
case 'G': /* --global-env */
524
567
case 129: /* --config-file */
525
568
free(argfile);
526
569
argfile = strdup(arg);
527
if(argfile == NULL){
528
perror("strdup");
529
}
530
break;
570
break;
531
571
case 130: /* --userid */
532
572
case 131: /* --groupid */
533
573
case 132: /* --debug */
574
case '?': /* --help */
575
case -3: /* --usage */
576
case 'V': /* --version */
534
577
case ARGP_KEY_ARG:
535
case ARGP_KEY_END:
536
578
break;
537
579
default:
538
580
return ARGP_ERR_UNKNOWN;
539
581
}
540
return 0;
582
return errno;
541
583
}
542
584
543
585
struct argp argp = { .options = options,
547
589
548
590
/* Parse using parse_opt_config_file() in order to get the custom
549
591
config file location, if any. */
550
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
551
if(ret == ARGP_ERR_UNKNOWN){
552
fprintf(stderr, "Unknown error while parsing arguments\n");
553
exitstatus = EXIT_FAILURE;
592
ret = argp_parse(&argp, argc, argv,
593
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
594
NULL, NULL);
595
switch(ret){
596
case 0:
597
break;
598
case ENOMEM:
599
default:
600
errno = ret;
601
perror("argp_parse");
602
exitstatus = EX_OSERR;
603
goto fallback;
604
case EINVAL:
605
exitstatus = EX_USAGE;
554
606
goto fallback;
555
607
}
556
608
562
614
conffp = fopen(AFILE, "r");
563
615
} else {
564
616
conffp = fopen(argfile, "r");
565
}
617
}
566
618
if(conffp != NULL){
567
619
char *org_line = NULL;
568
620
char *p, *arg, *new_arg, *line;
612
664
goto fallback;
613
665
}
614
666
custom_argv[custom_argc-1] = new_arg;
615
custom_argv[custom_argc] = NULL;
667
custom_argv[custom_argc] = NULL;
616
668
}
617
669
}
670
do {
671
ret = fclose(conffp);
672
} while(ret == EOF and errno == EINTR);
673
if(ret == EOF){
674
perror("fclose");
675
exitstatus = EXIT_FAILURE;
676
goto fallback;
677
}
618
678
free(org_line);
619
679
} else {
620
680
/* Check for harmful errors and go to fallback. Other errors might
625
685
goto fallback;
626
686
}
627
687
}
628
/* If there was any arguments from configuration file,
629
pass them to parser as command arguments */
688
/* If there were any arguments from the configuration file, pass
689
them to parser as command line arguments */
630
690
if(custom_argv != NULL){
631
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
632
0, NULL);
633
if(ret == ARGP_ERR_UNKNOWN){
634
fprintf(stderr, "Unknown error while parsing arguments\n");
635
exitstatus = EXIT_FAILURE;
691
ret = argp_parse(&argp, custom_argc, custom_argv,
692
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
693
NULL, NULL);
694
switch(ret){
695
case 0:
696
break;
697
case ENOMEM:
698
default:
699
errno = ret;
700
perror("argp_parse");
701
exitstatus = EX_OSERR;
702
goto fallback;
703
case EINVAL:
704
exitstatus = EX_CONFIG;
636
705
goto fallback;
637
706
}
638
707
}
639
708
640
709
/* Parse actual command line arguments, to let them override the
641
710
config file */
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;
711
ret = argp_parse(&argp, argc, argv,
712
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
713
NULL, NULL);
714
switch(ret){
715
case 0:
716
break;
717
case ENOMEM:
718
default:
719
errno = ret;
720
perror("argp_parse");
721
exitstatus = EX_OSERR;
722
goto fallback;
723
case EINVAL:
724
exitstatus = EX_USAGE;
646
725
goto fallback;
647
726
}
648
727
670
749
perror("setuid");
671
750
}
672
751
673
if(plugindir == NULL){
674
dir = opendir(PDIR);
675
} else {
676
dir = opendir(plugindir);
677
}
678
679
if(dir == NULL){
680
perror("Could not open plugin dir");
681
exitstatus = EXIT_FAILURE;
682
goto fallback;
683
}
684
685
/* Set the FD_CLOEXEC flag on the directory, if possible */
752
/* Open plugin directory with close_on_exec flag */
686
753
{
687
int dir_fd = dirfd(dir);
688
if(dir_fd >= 0){
689
ret = set_cloexec_flag(dir_fd);
690
if(ret < 0){
691
perror("set_cloexec_flag");
692
exitstatus = EXIT_FAILURE;
693
goto fallback;
694
}
754
int dir_fd = -1;
755
if(plugindir == NULL){
756
dir_fd = open(PDIR, O_RDONLY |
757
#ifdef O_CLOEXEC
758
O_CLOEXEC
759
#else /* not O_CLOEXEC */
760
0
761
#endif /* not O_CLOEXEC */
762
);
763
} else {
764
dir_fd = open(plugindir, O_RDONLY |
765
#ifdef O_CLOEXEC
766
O_CLOEXEC
767
#else /* not O_CLOEXEC */
768
0
769
#endif /* not O_CLOEXEC */
770
);
771
}
772
if(dir_fd == -1){
773
perror("Could not open plugin dir");
774
exitstatus = EXIT_FAILURE;
775
goto fallback;
776
}
777
778
#ifndef O_CLOEXEC
779
/* Set the FD_CLOEXEC flag on the directory */
780
ret = set_cloexec_flag(dir_fd);
781
if(ret < 0){
782
perror("set_cloexec_flag");
783
TEMP_FAILURE_RETRY(close(dir_fd));
784
exitstatus = EXIT_FAILURE;
785
goto fallback;
786
}
787
#endif /* O_CLOEXEC */
788
789
dir = fdopendir(dir_fd);
790
if(dir == NULL){
791
perror("Could not open plugin dir");
792
TEMP_FAILURE_RETRY(close(dir_fd));
793
exitstatus = EXIT_FAILURE;
794
goto fallback;
695
795
}
696
796
}
697
797
699
799
700
800
/* Read and execute any executable in the plugin directory*/
701
801
while(true){
702
dirst = readdir(dir);
802
do {
803
dirst = readdir(dir);
804
} while(dirst == NULL and errno == EINTR);
703
805
704
806
/* All directory entries have been processed */
705
807
if(dirst == NULL){
759
861
760
862
char *filename;
761
863
if(plugindir == NULL){
762
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
864
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
865
dirst->d_name));
763
866
} else {
764
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
867
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
868
plugindir,
869
dirst->d_name));
765
870
}
766
871
if(ret < 0){
767
872
perror("asprintf");
768
873
continue;
769
874
}
770
875
771
ret = stat(filename, &st);
876
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
772
877
if(ret == -1){
773
878
perror("stat");
774
879
free(filename);
776
881
}
777
882
778
883
/* Ignore non-executable files */
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
884
if(not S_ISREG(st.st_mode)
885
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
780
886
if(debug){
781
887
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
782
888
" with bad type or mode\n", filename);
828
934
}
829
935
830
936
int pipefd[2];
831
ret = pipe(pipefd);
937
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
832
938
if(ret == -1){
833
939
perror("pipe");
834
940
exitstatus = EXIT_FAILURE;
848
954
goto fallback;
849
955
}
850
956
/* Block SIGCHLD until process is safely in process list */
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
957
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
958
&sigchld_action.sa_mask,
959
NULL));
852
960
if(ret < 0){
853
961
perror("sigprocmask");
854
962
exitstatus = EXIT_FAILURE;
855
963
goto fallback;
856
964
}
857
965
/* Starting a new process to be watched */
858
pid_t pid = fork();
966
pid_t pid;
967
do {
968
pid = fork();
969
} while(pid == -1 and errno == EINTR);
859
970
if(pid == -1){
860
971
perror("fork");
861
972
exitstatus = EXIT_FAILURE;
899
1010
/* no return */
900
1011
}
901
1012
/* Parent process */
902
close(pipefd[1]); /* Close unused write end of pipe */
1013
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1014
pipe */
903
1015
free(filename);
904
1016
plugin *new_plugin = getplugin(dirst->d_name);
905
1017
if(new_plugin == NULL){
906
1018
perror("getplugin");
907
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1019
ret = (int)(TEMP_FAILURE_RETRY
1020
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1021
NULL)));
908
1022
if(ret < 0){
909
1023
perror("sigprocmask");
910
1024
}
917
1031
918
1032
/* Unblock SIGCHLD so signal handler can be run if this process
919
1033
has already completed */
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1035
&sigchld_action.sa_mask,
1036
NULL));
921
1037
if(ret < 0){
922
1038
perror("sigprocmask");
923
1039
exitstatus = EXIT_FAILURE;
924
1040
goto fallback;
925
1041
}
926
1042
927
FD_SET(new_plugin->fd, &rfds_all);
1043
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1044
-Wconversion */
928
1045
929
1046
if(maxfd < new_plugin->fd){
930
1047
maxfd = new_plugin->fd;
931
1048
}
932
1049
}
933
1050
934
closedir(dir);
1051
TEMP_FAILURE_RETRY(closedir(dir));
935
1052
dir = NULL;
936
1053
free_plugin(getplugin(NULL));
937
1054
950
1067
while(plugin_list){
951
1068
fd_set rfds = rfds_all;
952
1069
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
953
if(select_ret == -1){
1070
if(select_ret == -1 and errno != EINTR){
954
1071
perror("select");
955
1072
exitstatus = EXIT_FAILURE;
956
1073
goto fallback;
973
1090
WEXITSTATUS(proc->status));
974
1091
} else if(WIFSIGNALED(proc->status)){
975
1092
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
976
" signal %d\n", proc->name,
1093
" signal %d: %s\n", proc->name,
977
1094
(intmax_t) (proc->pid),
978
WTERMSIG(proc->status));
1095
WTERMSIG(proc->status),
1096
strsignal(WTERMSIG(proc->status)));
979
1097
} else if(WCOREDUMP(proc->status)){
980
1098
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
981
1099
" core\n", proc->name, (intmax_t) (proc->pid));
983
1101
}
984
1102
985
1103
/* Remove the plugin */
986
FD_CLR(proc->fd, &rfds_all);
1104
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1105
-Wconversion */
987
1106
988
1107
/* Block signal while modifying process_list */
989
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1108
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1109
(SIG_BLOCK,
1110
&sigchld_action.sa_mask,
1111
NULL));
990
1112
if(ret < 0){
991
1113
perror("sigprocmask");
992
1114
exitstatus = EXIT_FAILURE;
998
1120
proc = next_plugin;
999
1121
1000
1122
/* We are done modifying process list, so unblock signal */
1001
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1002
NULL);
1123
ret = (int)(TEMP_FAILURE_RETRY
1124
(sigprocmask(SIG_UNBLOCK,
1125
&sigchld_action.sa_mask, NULL)));
1003
1126
if(ret < 0){
1004
1127
perror("sigprocmask");
1005
1128
exitstatus = EXIT_FAILURE;
1025
1148
}
1026
1149
1027
1150
/* This process has not completed. Does it have any output? */
1028
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1151
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1152
warning from
1153
-Wconversion */
1029
1154
/* This process had nothing to say at this time */
1030
1155
proc = proc->next;
1031
1156
continue;
1042
1167
proc->buffer_size += BUFFER_SIZE;
1043
1168
}
1044
1169
/* Read from the process */
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1046
BUFFER_SIZE);
1170
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1171
proc->buffer
1172
+ proc->buffer_length,
1173
BUFFER_SIZE));
1047
1174
if(sret < 0){
1048
1175
/* Read error from this process; ignore the error */
1049
1176
proc = proc->next;
1111
1238
}
1112
1239
1113
1240
/* Wait for any remaining child processes to terminate */
1114
do{
1241
do {
1115
1242
ret = wait(NULL);
1116
1243
} while(ret >= 0);
1117
1244
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0