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 364
- compare with another revision
- download diff
- download tarball
- view history from revision 364
- Committer: Teddy Hogeborn
- Date: 2009-09-07 23:48:17 UTC
- Revision ID: teddy@fukt.bsnet.se-20090907234817-op1lgg9gpruejsiv
* initramfs-tools-hook: Bug fix: Really install user-supplied plugins.
Bug fix: Warn about empty plugin directory.
Bug fix: Warn about empty plugin directory.
- files added:
- debian/watch
- files renamed:
- mandos-list => mandos-ctl
- files modified:
- INSTALL
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
*
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
45
#include <dirent.h> /* DIR, struct dirent, opendir(),
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,
62
64
#include <signal.h> /* struct sigaction, sigemptyset(),
63
65
sigaddset(), sigaction(),
64
66
sigprocmask(), SIG_BLOCK, SIGCHLD,
65
SIG_UNBLOCK, kill() */
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
66
69
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
67
71
68
72
#define BUFFER_SIZE 256
69
73
80
84
char **environ;
81
85
int envc;
82
86
bool disabled;
83
87
84
88
/* Variables used for running processes*/
85
89
pid_t pid;
86
90
int fd;
88
92
size_t buffer_size;
89
93
size_t buffer_length;
90
94
bool eof;
91
volatile bool completed;
92
volatile int status;
95
volatile sig_atomic_t completed;
96
int status;
93
97
struct plugin *next;
94
98
} plugin;
95
99
99
103
or if none is found, creates a new one */
100
104
static plugin *getplugin(char *name){
101
105
/* Check for exiting plugin with that name */
102
for (plugin *p = plugin_list; p != NULL; p = p->next){
103
if ((p->name == name)
104
or (p->name and name and (strcmp(p->name, name) == 0))){
106
for(plugin *p = plugin_list; p != NULL; p = p->next){
107
if((p->name == name)
108
or (p->name and name and (strcmp(p->name, name) == 0))){
105
109
return p;
106
110
}
107
111
}
108
112
/* Create a new plugin */
109
plugin *new_plugin = malloc(sizeof(plugin));
110
if (new_plugin == NULL){
113
plugin *new_plugin = NULL;
114
do {
115
new_plugin = malloc(sizeof(plugin));
116
} while(new_plugin == NULL and errno == EINTR);
117
if(new_plugin == NULL){
111
118
return NULL;
112
119
}
113
120
char *copy_name = NULL;
114
121
if(name != NULL){
115
copy_name = strdup(name);
122
do {
123
copy_name = strdup(name);
124
} while(copy_name == NULL and errno == EINTR);
116
125
if(copy_name == NULL){
126
free(new_plugin);
117
127
return NULL;
118
128
}
119
129
}
120
130
121
*new_plugin = (plugin) { .name = copy_name,
122
.argc = 1,
123
.disabled = false,
124
.next = plugin_list };
131
*new_plugin = (plugin){ .name = copy_name,
132
.argc = 1,
133
.disabled = false,
134
.next = plugin_list };
125
135
126
new_plugin->argv = malloc(sizeof(char *) * 2);
127
if (new_plugin->argv == NULL){
136
do {
137
new_plugin->argv = malloc(sizeof(char *) * 2);
138
} while(new_plugin->argv == NULL and errno == EINTR);
139
if(new_plugin->argv == NULL){
128
140
free(copy_name);
129
141
free(new_plugin);
130
142
return NULL;
132
144
new_plugin->argv[0] = copy_name;
133
145
new_plugin->argv[1] = NULL;
134
146
135
new_plugin->environ = malloc(sizeof(char *));
147
do {
148
new_plugin->environ = malloc(sizeof(char *));
149
} while(new_plugin->environ == NULL and errno == EINTR);
136
150
if(new_plugin->environ == NULL){
137
151
free(copy_name);
138
152
free(new_plugin->argv);
150
164
static bool add_to_char_array(const char *new, char ***array,
151
165
int *len){
152
166
/* Resize the pointed-to array to hold one more pointer */
153
*array = realloc(*array, sizeof(char *)
154
* (size_t) ((*len) + 2));
167
do {
168
*array = realloc(*array, sizeof(char *)
169
* (size_t) ((*len) + 2));
170
} while(*array == NULL and errno == EINTR);
155
171
/* Malloc check */
156
172
if(*array == NULL){
157
173
return false;
158
174
}
159
175
/* Make a copy of the new string */
160
char *copy = strdup(new);
176
char *copy;
177
do {
178
copy = strdup(new);
179
} while(copy == NULL and errno == EINTR);
161
180
if(copy == NULL){
162
181
return false;
163
182
}
189
208
if(strncmp(*e, def, namelen + 1) == 0){
190
209
/* It already exists */
191
210
if(replace){
192
char *new = realloc(*e, strlen(def) + 1);
211
char *new;
212
do {
213
new = realloc(*e, strlen(def) + 1);
214
} while(new == NULL and errno == EINTR);
193
215
if(new == NULL){
194
216
return false;
195
217
}
205
227
/*
206
228
* Based on the example in the GNU LibC manual chapter 13.13 "File
207
229
* Descriptor Flags".
208
* *Note File Descriptor Flags:(libc)Descriptor Flags.
230
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
209
231
*/
210
232
static int set_cloexec_flag(int fd){
211
int ret = fcntl(fd, F_GETFD, 0);
233
int ret = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
212
234
/* If reading the flags failed, return error indication now. */
213
235
if(ret < 0){
214
236
return ret;
215
237
}
216
238
/* Store modified flag word in the descriptor. */
217
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
239
return TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, ret | FD_CLOEXEC));
218
240
}
219
241
220
242
221
243
/* Mark processes as completed when they exit, and save their exit
222
244
status. */
223
245
static void handle_sigchld(__attribute__((unused)) int sig){
246
int old_errno = errno;
224
247
while(true){
225
248
plugin *proc = plugin_list;
226
249
int status;
230
253
break;
231
254
}
232
255
if(pid == -1){
233
if (errno != ECHILD){
234
perror("waitpid");
256
if(errno == ECHILD){
257
/* No child processes */
258
break;
235
259
}
236
/* No child processes */
237
break;
260
perror("waitpid");
238
261
}
239
262
240
263
/* A child exited, find it in process_list */
246
269
continue;
247
270
}
248
271
proc->status = status;
249
proc->completed = true;
272
proc->completed = 1;
250
273
}
274
errno = old_errno;
251
275
}
252
276
253
277
/* Prints out a password to stdout */
275
299
}
276
300
free(plugin_node->environ);
277
301
free(plugin_node->buffer);
278
302
279
303
/* Removes the plugin from the singly-linked list */
280
304
if(plugin_node == plugin_list){
281
305
/* First one - simple */
372
396
{ .name = NULL }
373
397
};
374
398
375
error_t parse_opt (int key, char *arg, __attribute__((unused))
376
struct argp_state *state) {
377
switch (key) {
399
error_t parse_opt(int key, char *arg, __attribute__((unused))
400
struct argp_state *state){
401
switch(key){
402
char *tmp;
403
intmax_t tmpmax;
378
404
case 'g': /* --global-options */
379
if (arg != NULL){
380
char *p;
381
while((p = strsep(&arg, ",")) != NULL){
382
if(p[0] == '\0'){
405
if(arg != NULL){
406
char *plugin_option;
407
while((plugin_option = strsep(&arg, ",")) != NULL){
408
if(plugin_option[0] == '\0'){
383
409
continue;
384
410
}
385
if(not add_argument(getplugin(NULL), p)){
411
if(not add_argument(getplugin(NULL), plugin_option)){
386
412
perror("add_argument");
387
413
return ARGP_ERR_UNKNOWN;
388
414
}
398
424
}
399
425
break;
400
426
case 'o': /* --options-for */
401
if (arg != NULL){
402
char *p_name = strsep(&arg, ":");
403
if(p_name[0] == '\0' or arg == NULL){
404
break;
405
}
406
char *opt = strsep(&arg, ":");
407
if(opt[0] == '\0' or opt == NULL){
408
break;
409
}
410
char *p;
411
while((p = strsep(&opt, ",")) != NULL){
412
if(p[0] == '\0'){
413
continue;
414
}
415
if(not add_argument(getplugin(p_name), p)){
427
if(arg != NULL){
428
char *plugin_name = strsep(&arg, ":");
429
if(plugin_name[0] == '\0'){
430
break;
431
}
432
char *plugin_option;
433
while((plugin_option = strsep(&arg, ",")) != NULL){
434
if(not add_argument(getplugin(plugin_name), plugin_option)){
416
435
perror("add_argument");
417
436
return ARGP_ERR_UNKNOWN;
418
437
}
435
454
}
436
455
break;
437
456
case 'd': /* --disable */
438
if (arg != NULL){
457
if(arg != NULL){
439
458
plugin *p = getplugin(arg);
440
459
if(p == NULL){
441
460
return ARGP_ERR_UNKNOWN;
444
463
}
445
464
break;
446
465
case 'e': /* --enable */
447
if (arg != NULL){
466
if(arg != NULL){
448
467
plugin *p = getplugin(arg);
449
468
if(p == NULL){
450
469
return ARGP_ERR_UNKNOWN;
457
476
plugindir = strdup(arg);
458
477
if(plugindir == NULL){
459
478
perror("strdup");
460
}
479
}
461
480
break;
462
481
case 129: /* --config-file */
463
482
/* This is already done by parse_opt_config_file() */
464
483
break;
465
484
case 130: /* --userid */
466
uid = (uid_t)strtol(arg, NULL, 10);
485
errno = 0;
486
tmpmax = strtoimax(arg, &tmp, 10);
487
if(errno != 0 or tmp == arg or *tmp != '\0'
488
or tmpmax != (uid_t)tmpmax){
489
fprintf(stderr, "Bad user ID number: \"%s\", using %"
490
PRIdMAX "\n", arg, (intmax_t)uid);
491
} else {
492
uid = (uid_t)tmpmax;
493
}
467
494
break;
468
495
case 131: /* --groupid */
469
gid = (gid_t)strtol(arg, NULL, 10);
496
errno = 0;
497
tmpmax = strtoimax(arg, &tmp, 10);
498
if(errno != 0 or tmp == arg or *tmp != '\0'
499
or tmpmax != (gid_t)tmpmax){
500
fprintf(stderr, "Bad group ID number: \"%s\", using %"
501
PRIdMAX "\n", arg, (intmax_t)gid);
502
} else {
503
gid = (gid_t)tmpmax;
504
}
470
505
break;
471
506
case 132: /* --debug */
472
507
debug = true;
473
508
break;
509
/*
510
* When adding more options before this line, remember to also add a
511
* "case" to the "parse_opt_config_file" function below.
512
*/
474
513
case ARGP_KEY_ARG:
475
514
/* Cryptsetup always passes an argument, which is an empty
476
515
string if "none" was specified in /etc/crypttab. So if
489
528
490
529
/* This option parser is the same as parse_opt() above, except it
491
530
ignores everything but the --config-file option. */
492
error_t parse_opt_config_file (int key, char *arg,
493
__attribute__((unused))
494
struct argp_state *state) {
495
switch (key) {
531
error_t parse_opt_config_file(int key, char *arg,
532
__attribute__((unused))
533
struct argp_state *state){
534
switch(key){
496
535
case 'g': /* --global-options */
497
536
case 'G': /* --global-env */
498
537
case 'o': /* --options-for */
507
546
if(argfile == NULL){
508
547
perror("strdup");
509
548
}
510
break;
549
break;
511
550
case 130: /* --userid */
512
551
case 131: /* --groupid */
513
552
case 132: /* --debug */
525
564
.args_doc = "",
526
565
.doc = "Mandos plugin runner -- Run plugins" };
527
566
528
/* Parse using the parse_opt_config_file in order to get the custom
567
/* Parse using parse_opt_config_file() in order to get the custom
529
568
config file location, if any. */
530
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
531
if (ret == ARGP_ERR_UNKNOWN){
569
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
570
if(ret == ARGP_ERR_UNKNOWN){
532
571
fprintf(stderr, "Unknown error while parsing arguments\n");
533
572
exitstatus = EXIT_FAILURE;
534
573
goto fallback;
538
577
argp.parser = parse_opt;
539
578
540
579
/* Open the configfile if available */
541
if (argfile == NULL){
580
if(argfile == NULL){
542
581
conffp = fopen(AFILE, "r");
543
582
} else {
544
583
conffp = fopen(argfile, "r");
545
}
584
}
546
585
if(conffp != NULL){
547
586
char *org_line = NULL;
548
587
char *p, *arg, *new_arg, *line;
549
588
size_t size = 0;
550
589
const char whitespace_delims[] = " \r\t\f\v\n";
551
590
const char comment_delim[] = "#";
552
591
553
592
custom_argc = 1;
554
593
custom_argv = malloc(sizeof(char*) * 2);
555
594
if(custom_argv == NULL){
559
598
}
560
599
custom_argv[0] = argv[0];
561
600
custom_argv[1] = NULL;
562
601
563
602
/* for each line in the config file, strip whitespace and ignore
564
603
commented text */
565
604
while(true){
567
606
if(sret == -1){
568
607
break;
569
608
}
570
609
571
610
line = org_line;
572
611
arg = strsep(&line, comment_delim);
573
612
while((p = strsep(&arg, whitespace_delims)) != NULL){
592
631
goto fallback;
593
632
}
594
633
custom_argv[custom_argc-1] = new_arg;
595
custom_argv[custom_argc] = NULL;
634
custom_argv[custom_argc] = NULL;
596
635
}
597
636
}
637
do {
638
ret = fclose(conffp);
639
} while(ret == EOF and errno == EINTR);
640
if(ret == EOF){
641
perror("fclose");
642
exitstatus = EXIT_FAILURE;
643
goto fallback;
644
}
598
645
free(org_line);
599
646
} else {
600
647
/* Check for harmful errors and go to fallback. Other errors might
601
648
not affect opening plugins */
602
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
649
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
603
650
perror("fopen");
604
651
exitstatus = EXIT_FAILURE;
605
652
goto fallback;
608
655
/* If there was any arguments from configuration file,
609
656
pass them to parser as command arguments */
610
657
if(custom_argv != NULL){
611
ret = argp_parse (&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
612
0, NULL);
613
if (ret == ARGP_ERR_UNKNOWN){
658
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
659
0, NULL);
660
if(ret == ARGP_ERR_UNKNOWN){
614
661
fprintf(stderr, "Unknown error while parsing arguments\n");
615
662
exitstatus = EXIT_FAILURE;
616
663
goto fallback;
619
666
620
667
/* Parse actual command line arguments, to let them override the
621
668
config file */
622
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
623
if (ret == ARGP_ERR_UNKNOWN){
669
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
670
if(ret == ARGP_ERR_UNKNOWN){
624
671
fprintf(stderr, "Unknown error while parsing arguments\n");
625
672
exitstatus = EXIT_FAILURE;
626
673
goto fallback;
633
680
for(char **a = p->argv; *a != NULL; a++){
634
681
fprintf(stderr, "\tArg: %s\n", *a);
635
682
}
636
fprintf(stderr, "...and %u environment variables\n", p->envc);
683
fprintf(stderr, "...and %d environment variables\n", p->envc);
637
684
for(char **a = p->environ; *a != NULL; a++){
638
685
fprintf(stderr, "\t%s\n", *a);
639
686
}
641
688
}
642
689
643
690
/* Strip permissions down to nobody */
691
setgid(gid);
692
if(ret == -1){
693
perror("setgid");
694
}
644
695
ret = setuid(uid);
645
if (ret == -1){
696
if(ret == -1){
646
697
perror("setuid");
647
}
648
setgid(gid);
649
if (ret == -1){
650
perror("setgid");
651
698
}
652
699
653
if (plugindir == NULL){
700
if(plugindir == NULL){
654
701
dir = opendir(PDIR);
655
702
} else {
656
703
dir = opendir(plugindir);
679
726
680
727
/* Read and execute any executable in the plugin directory*/
681
728
while(true){
682
dirst = readdir(dir);
729
do {
730
dirst = readdir(dir);
731
} while(dirst == NULL and errno == EINTR);
683
732
684
733
/* All directory entries have been processed */
685
734
if(dirst == NULL){
686
if (errno == EBADF){
735
if(errno == EBADF){
687
736
perror("readdir");
688
737
exitstatus = EXIT_FAILURE;
689
738
goto fallback;
736
785
continue;
737
786
}
738
787
}
739
788
740
789
char *filename;
741
790
if(plugindir == NULL){
742
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
791
ret = TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
792
dirst->d_name));
743
793
} else {
744
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
794
ret = TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s", plugindir,
795
dirst->d_name));
745
796
}
746
797
if(ret < 0){
747
798
perror("asprintf");
748
799
continue;
749
800
}
750
801
751
ret = stat(filename, &st);
752
if (ret == -1){
802
ret = TEMP_FAILURE_RETRY(stat(filename, &st));
803
if(ret == -1){
753
804
perror("stat");
754
805
free(filename);
755
806
continue;
756
807
}
757
808
758
809
/* Ignore non-executable files */
759
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
810
if(not S_ISREG(st.st_mode)
811
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
760
812
if(debug){
761
813
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
762
814
" with bad type or mode\n", filename);
808
860
}
809
861
810
862
int pipefd[2];
811
ret = pipe(pipefd);
812
if (ret == -1){
863
ret = TEMP_FAILURE_RETRY(pipe(pipefd));
864
if(ret == -1){
813
865
perror("pipe");
814
866
exitstatus = EXIT_FAILURE;
815
867
goto fallback;
828
880
goto fallback;
829
881
}
830
882
/* Block SIGCHLD until process is safely in process list */
831
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
883
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
884
&sigchld_action.sa_mask,
885
NULL));
832
886
if(ret < 0){
833
887
perror("sigprocmask");
834
888
exitstatus = EXIT_FAILURE;
835
889
goto fallback;
836
890
}
837
891
/* Starting a new process to be watched */
838
pid_t pid = fork();
892
pid_t pid;
893
do {
894
pid = fork();
895
} while(pid == -1 and errno == EINTR);
839
896
if(pid == -1){
840
897
perror("fork");
841
898
exitstatus = EXIT_FAILURE;
879
936
/* no return */
880
937
}
881
938
/* Parent process */
882
close(pipefd[1]); /* Close unused write end of pipe */
939
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
940
pipe */
883
941
free(filename);
884
942
plugin *new_plugin = getplugin(dirst->d_name);
885
if (new_plugin == NULL){
943
if(new_plugin == NULL){
886
944
perror("getplugin");
887
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
945
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
946
&sigchld_action.sa_mask,
947
NULL));
888
948
if(ret < 0){
889
949
perror("sigprocmask");
890
950
}
897
957
898
958
/* Unblock SIGCHLD so signal handler can be run if this process
899
959
has already completed */
900
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
960
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
961
&sigchld_action.sa_mask,
962
NULL));
901
963
if(ret < 0){
902
964
perror("sigprocmask");
903
965
exitstatus = EXIT_FAILURE;
906
968
907
969
FD_SET(new_plugin->fd, &rfds_all);
908
970
909
if (maxfd < new_plugin->fd){
971
if(maxfd < new_plugin->fd){
910
972
maxfd = new_plugin->fd;
911
973
}
912
974
}
913
975
914
closedir(dir);
976
TEMP_FAILURE_RETRY(closedir(dir));
915
977
dir = NULL;
978
free_plugin(getplugin(NULL));
916
979
917
980
for(plugin *p = plugin_list; p != NULL; p = p->next){
918
981
if(p->pid != 0){
929
992
while(plugin_list){
930
993
fd_set rfds = rfds_all;
931
994
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
932
if (select_ret == -1){
995
if(select_ret == -1 and errno != EINTR){
933
996
perror("select");
934
997
exitstatus = EXIT_FAILURE;
935
998
goto fallback;
938
1001
from one of them */
939
1002
for(plugin *proc = plugin_list; proc != NULL;){
940
1003
/* Is this process completely done? */
941
if(proc->eof and proc->completed){
1004
if(proc->completed and proc->eof){
942
1005
/* Only accept the plugin output if it exited cleanly */
943
1006
if(not WIFEXITED(proc->status)
944
1007
or WEXITSTATUS(proc->status) != 0){
945
1008
/* Bad exit by plugin */
946
1009
947
1010
if(debug){
948
1011
if(WIFEXITED(proc->status)){
949
fprintf(stderr, "Plugin %u exited with status %d\n",
950
(unsigned int) (proc->pid),
1012
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1013
" status %d\n", proc->name,
1014
(intmax_t) (proc->pid),
951
1015
WEXITSTATUS(proc->status));
952
} else if(WIFSIGNALED(proc->status)) {
953
fprintf(stderr, "Plugin %u killed by signal %d\n",
954
(unsigned int) (proc->pid),
955
WTERMSIG(proc->status));
1016
} else if(WIFSIGNALED(proc->status)){
1017
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1018
" signal %d: %s\n", proc->name,
1019
(intmax_t) (proc->pid),
1020
WTERMSIG(proc->status),
1021
strsignal(WTERMSIG(proc->status)));
956
1022
} else if(WCOREDUMP(proc->status)){
957
fprintf(stderr, "Plugin %d dumped core\n",
958
(unsigned int) (proc->pid));
1023
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1024
" core\n", proc->name, (intmax_t) (proc->pid));
959
1025
}
960
1026
}
961
1027
962
1028
/* Remove the plugin */
963
1029
FD_CLR(proc->fd, &rfds_all);
964
1030
965
1031
/* Block signal while modifying process_list */
966
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1032
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1033
&sigchld_action.sa_mask,
1034
NULL));
967
1035
if(ret < 0){
968
1036
perror("sigprocmask");
969
1037
exitstatus = EXIT_FAILURE;
975
1043
proc = next_plugin;
976
1044
977
1045
/* We are done modifying process list, so unblock signal */
978
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
979
NULL);
1046
ret = TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1047
&sigchld_action.sa_mask,
1048
NULL));
980
1049
if(ret < 0){
981
1050
perror("sigprocmask");
982
1051
exitstatus = EXIT_FAILURE;
1011
1080
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1012
1081
proc->buffer = realloc(proc->buffer, proc->buffer_size
1013
1082
+ (size_t) BUFFER_SIZE);
1014
if (proc->buffer == NULL){
1083
if(proc->buffer == NULL){
1015
1084
perror("malloc");
1016
1085
exitstatus = EXIT_FAILURE;
1017
1086
goto fallback;
1019
1088
proc->buffer_size += BUFFER_SIZE;
1020
1089
}
1021
1090
/* Read from the process */
1022
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1023
BUFFER_SIZE);
1091
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1092
proc->buffer
1093
+ proc->buffer_length,
1094
BUFFER_SIZE));
1024
1095
if(sret < 0){
1025
1096
/* Read error from this process; ignore the error */
1026
1097
proc = proc->next;
1034
1105
}
1035
1106
}
1036
1107
}
1037
1038
1108
1109
1039
1110
fallback:
1040
1111
1041
1112
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1088
1159
}
1089
1160
1090
1161
/* Wait for any remaining child processes to terminate */
1091
do{
1162
do {
1092
1163
ret = wait(NULL);
1093
1164
} while(ret >= 0);
1094
1165
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0