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 237.2.34
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.34
- Committer: teddy at bsnet
- Date: 2010-08-11 20:06:18 UTC
- mto: This revision was merged to the branch mainline in revision 419.
- Revision ID: teddy@fukt.bsnet.se-20100811200618-1uuv7p6cmrb2cmxu
* plugins.d/mandos-client.c: Added debug output.
- 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 = (int)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 (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
240
ret | FD_CLOEXEC));
218
241
}
219
242
220
243
221
244
/* Mark processes as completed when they exit, and save their exit
222
245
status. */
223
246
static void handle_sigchld(__attribute__((unused)) int sig){
247
int old_errno = errno;
224
248
while(true){
225
249
plugin *proc = plugin_list;
226
250
int status;
230
254
break;
231
255
}
232
256
if(pid == -1){
233
if (errno != ECHILD){
234
perror("waitpid");
257
if(errno == ECHILD){
258
/* No child processes */
259
break;
235
260
}
236
/* No child processes */
237
break;
261
perror("waitpid");
238
262
}
239
263
240
264
/* A child exited, find it in process_list */
246
270
continue;
247
271
}
248
272
proc->status = status;
249
proc->completed = true;
273
proc->completed = 1;
250
274
}
275
errno = old_errno;
251
276
}
252
277
253
278
/* Prints out a password to stdout */
275
300
}
276
301
free(plugin_node->environ);
277
302
free(plugin_node->buffer);
278
303
279
304
/* Removes the plugin from the singly-linked list */
280
305
if(plugin_node == plugin_list){
281
306
/* First one - simple */
372
397
{ .name = NULL }
373
398
};
374
399
375
error_t parse_opt (int key, char *arg, __attribute__((unused))
376
struct argp_state *state) {
377
switch (key) {
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
401
struct argp_state *state){
402
switch(key){
403
char *tmp;
404
intmax_t tmpmax;
378
405
case 'g': /* --global-options */
379
if (arg != NULL){
380
char *p;
381
while((p = strsep(&arg, ",")) != NULL){
382
if(p[0] == '\0'){
406
if(arg != NULL){
407
char *plugin_option;
408
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
383
410
continue;
384
411
}
385
if(not add_argument(getplugin(NULL), p)){
412
if(not add_argument(getplugin(NULL), plugin_option)){
386
413
perror("add_argument");
387
414
return ARGP_ERR_UNKNOWN;
388
415
}
398
425
}
399
426
break;
400
427
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)){
428
if(arg != NULL){
429
char *plugin_name = strsep(&arg, ":");
430
if(plugin_name[0] == '\0'){
431
break;
432
}
433
char *plugin_option;
434
while((plugin_option = strsep(&arg, ",")) != NULL){
435
if(not add_argument(getplugin(plugin_name), plugin_option)){
416
436
perror("add_argument");
417
437
return ARGP_ERR_UNKNOWN;
418
438
}
435
455
}
436
456
break;
437
457
case 'd': /* --disable */
438
if (arg != NULL){
458
if(arg != NULL){
439
459
plugin *p = getplugin(arg);
440
460
if(p == NULL){
441
461
return ARGP_ERR_UNKNOWN;
444
464
}
445
465
break;
446
466
case 'e': /* --enable */
447
if (arg != NULL){
467
if(arg != NULL){
448
468
plugin *p = getplugin(arg);
449
469
if(p == NULL){
450
470
return ARGP_ERR_UNKNOWN;
457
477
plugindir = strdup(arg);
458
478
if(plugindir == NULL){
459
479
perror("strdup");
460
}
480
}
461
481
break;
462
482
case 129: /* --config-file */
463
483
/* This is already done by parse_opt_config_file() */
464
484
break;
465
485
case 130: /* --userid */
466
uid = (uid_t)strtol(arg, NULL, 10);
486
errno = 0;
487
tmpmax = strtoimax(arg, &tmp, 10);
488
if(errno != 0 or tmp == arg or *tmp != '\0'
489
or tmpmax != (uid_t)tmpmax){
490
fprintf(stderr, "Bad user ID number: \"%s\", using %"
491
PRIdMAX "\n", arg, (intmax_t)uid);
492
} else {
493
uid = (uid_t)tmpmax;
494
}
467
495
break;
468
496
case 131: /* --groupid */
469
gid = (gid_t)strtol(arg, NULL, 10);
497
errno = 0;
498
tmpmax = strtoimax(arg, &tmp, 10);
499
if(errno != 0 or tmp == arg or *tmp != '\0'
500
or tmpmax != (gid_t)tmpmax){
501
fprintf(stderr, "Bad group ID number: \"%s\", using %"
502
PRIdMAX "\n", arg, (intmax_t)gid);
503
} else {
504
gid = (gid_t)tmpmax;
505
}
470
506
break;
471
507
case 132: /* --debug */
472
508
debug = true;
473
509
break;
510
/*
511
* When adding more options before this line, remember to also add a
512
* "case" to the "parse_opt_config_file" function below.
513
*/
474
514
case ARGP_KEY_ARG:
475
515
/* Cryptsetup always passes an argument, which is an empty
476
516
string if "none" was specified in /etc/crypttab. So if
489
529
490
530
/* This option parser is the same as parse_opt() above, except it
491
531
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) {
532
error_t parse_opt_config_file(int key, char *arg,
533
__attribute__((unused))
534
struct argp_state *state){
535
switch(key){
496
536
case 'g': /* --global-options */
497
537
case 'G': /* --global-env */
498
538
case 'o': /* --options-for */
507
547
if(argfile == NULL){
508
548
perror("strdup");
509
549
}
510
break;
550
break;
511
551
case 130: /* --userid */
512
552
case 131: /* --groupid */
513
553
case 132: /* --debug */
525
565
.args_doc = "",
526
566
.doc = "Mandos plugin runner -- Run plugins" };
527
567
528
/* Parse using the parse_opt_config_file in order to get the custom
568
/* Parse using parse_opt_config_file() in order to get the custom
529
569
config file location, if any. */
530
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
531
if (ret == ARGP_ERR_UNKNOWN){
570
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
571
if(ret == ARGP_ERR_UNKNOWN){
532
572
fprintf(stderr, "Unknown error while parsing arguments\n");
533
573
exitstatus = EXIT_FAILURE;
534
574
goto fallback;
538
578
argp.parser = parse_opt;
539
579
540
580
/* Open the configfile if available */
541
if (argfile == NULL){
581
if(argfile == NULL){
542
582
conffp = fopen(AFILE, "r");
543
583
} else {
544
584
conffp = fopen(argfile, "r");
545
}
585
}
546
586
if(conffp != NULL){
547
587
char *org_line = NULL;
548
588
char *p, *arg, *new_arg, *line;
549
589
size_t size = 0;
550
590
const char whitespace_delims[] = " \r\t\f\v\n";
551
591
const char comment_delim[] = "#";
552
592
553
593
custom_argc = 1;
554
594
custom_argv = malloc(sizeof(char*) * 2);
555
595
if(custom_argv == NULL){
559
599
}
560
600
custom_argv[0] = argv[0];
561
601
custom_argv[1] = NULL;
562
602
563
603
/* for each line in the config file, strip whitespace and ignore
564
604
commented text */
565
605
while(true){
567
607
if(sret == -1){
568
608
break;
569
609
}
570
610
571
611
line = org_line;
572
612
arg = strsep(&line, comment_delim);
573
613
while((p = strsep(&arg, whitespace_delims)) != NULL){
592
632
goto fallback;
593
633
}
594
634
custom_argv[custom_argc-1] = new_arg;
595
custom_argv[custom_argc] = NULL;
635
custom_argv[custom_argc] = NULL;
596
636
}
597
637
}
638
do {
639
ret = fclose(conffp);
640
} while(ret == EOF and errno == EINTR);
641
if(ret == EOF){
642
perror("fclose");
643
exitstatus = EXIT_FAILURE;
644
goto fallback;
645
}
598
646
free(org_line);
599
647
} else {
600
648
/* Check for harmful errors and go to fallback. Other errors might
601
649
not affect opening plugins */
602
if (errno == EMFILE or errno == ENFILE or errno == ENOMEM){
650
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
603
651
perror("fopen");
604
652
exitstatus = EXIT_FAILURE;
605
653
goto fallback;
608
656
/* If there was any arguments from configuration file,
609
657
pass them to parser as command arguments */
610
658
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){
659
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
660
0, NULL);
661
if(ret == ARGP_ERR_UNKNOWN){
614
662
fprintf(stderr, "Unknown error while parsing arguments\n");
615
663
exitstatus = EXIT_FAILURE;
616
664
goto fallback;
619
667
620
668
/* Parse actual command line arguments, to let them override the
621
669
config file */
622
ret = argp_parse (&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
623
if (ret == ARGP_ERR_UNKNOWN){
670
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
671
if(ret == ARGP_ERR_UNKNOWN){
624
672
fprintf(stderr, "Unknown error while parsing arguments\n");
625
673
exitstatus = EXIT_FAILURE;
626
674
goto fallback;
633
681
for(char **a = p->argv; *a != NULL; a++){
634
682
fprintf(stderr, "\tArg: %s\n", *a);
635
683
}
636
fprintf(stderr, "...and %u environment variables\n", p->envc);
684
fprintf(stderr, "...and %d environment variables\n", p->envc);
637
685
for(char **a = p->environ; *a != NULL; a++){
638
686
fprintf(stderr, "\t%s\n", *a);
639
687
}
641
689
}
642
690
643
691
/* Strip permissions down to nobody */
692
setgid(gid);
693
if(ret == -1){
694
perror("setgid");
695
}
644
696
ret = setuid(uid);
645
if (ret == -1){
697
if(ret == -1){
646
698
perror("setuid");
647
}
648
setgid(gid);
649
if (ret == -1){
650
perror("setgid");
651
699
}
652
700
653
if (plugindir == NULL){
701
if(plugindir == NULL){
654
702
dir = opendir(PDIR);
655
703
} else {
656
704
dir = opendir(plugindir);
679
727
680
728
/* Read and execute any executable in the plugin directory*/
681
729
while(true){
682
dirst = readdir(dir);
730
do {
731
dirst = readdir(dir);
732
} while(dirst == NULL and errno == EINTR);
683
733
684
734
/* All directory entries have been processed */
685
735
if(dirst == NULL){
686
if (errno == EBADF){
736
if(errno == EBADF){
687
737
perror("readdir");
688
738
exitstatus = EXIT_FAILURE;
689
739
goto fallback;
736
786
continue;
737
787
}
738
788
}
739
789
740
790
char *filename;
741
791
if(plugindir == NULL){
742
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
792
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
793
dirst->d_name));
743
794
} else {
744
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
795
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
796
plugindir,
797
dirst->d_name));
745
798
}
746
799
if(ret < 0){
747
800
perror("asprintf");
748
801
continue;
749
802
}
750
803
751
ret = stat(filename, &st);
752
if (ret == -1){
804
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
805
if(ret == -1){
753
806
perror("stat");
754
807
free(filename);
755
808
continue;
756
809
}
757
810
758
811
/* Ignore non-executable files */
759
if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
812
if(not S_ISREG(st.st_mode)
813
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
760
814
if(debug){
761
815
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
762
816
" with bad type or mode\n", filename);
808
862
}
809
863
810
864
int pipefd[2];
811
ret = pipe(pipefd);
812
if (ret == -1){
865
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
866
if(ret == -1){
813
867
perror("pipe");
814
868
exitstatus = EXIT_FAILURE;
815
869
goto fallback;
828
882
goto fallback;
829
883
}
830
884
/* Block SIGCHLD until process is safely in process list */
831
ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL);
885
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
886
&sigchld_action.sa_mask,
887
NULL));
832
888
if(ret < 0){
833
889
perror("sigprocmask");
834
890
exitstatus = EXIT_FAILURE;
835
891
goto fallback;
836
892
}
837
893
/* Starting a new process to be watched */
838
pid_t pid = fork();
894
pid_t pid;
895
do {
896
pid = fork();
897
} while(pid == -1 and errno == EINTR);
839
898
if(pid == -1){
840
899
perror("fork");
841
900
exitstatus = EXIT_FAILURE;
879
938
/* no return */
880
939
}
881
940
/* Parent process */
882
close(pipefd[1]); /* Close unused write end of pipe */
941
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
942
pipe */
883
943
free(filename);
884
944
plugin *new_plugin = getplugin(dirst->d_name);
885
if (new_plugin == NULL){
945
if(new_plugin == NULL){
886
946
perror("getplugin");
887
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
947
ret = (int)(TEMP_FAILURE_RETRY
948
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
949
NULL)));
888
950
if(ret < 0){
889
951
perror("sigprocmask");
890
952
}
897
959
898
960
/* Unblock SIGCHLD so signal handler can be run if this process
899
961
has already completed */
900
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
962
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
963
&sigchld_action.sa_mask,
964
NULL));
901
965
if(ret < 0){
902
966
perror("sigprocmask");
903
967
exitstatus = EXIT_FAILURE;
906
970
907
971
FD_SET(new_plugin->fd, &rfds_all);
908
972
909
if (maxfd < new_plugin->fd){
973
if(maxfd < new_plugin->fd){
910
974
maxfd = new_plugin->fd;
911
975
}
912
976
}
913
977
914
closedir(dir);
978
TEMP_FAILURE_RETRY(closedir(dir));
915
979
dir = NULL;
980
free_plugin(getplugin(NULL));
916
981
917
982
for(plugin *p = plugin_list; p != NULL; p = p->next){
918
983
if(p->pid != 0){
929
994
while(plugin_list){
930
995
fd_set rfds = rfds_all;
931
996
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
932
if (select_ret == -1){
997
if(select_ret == -1 and errno != EINTR){
933
998
perror("select");
934
999
exitstatus = EXIT_FAILURE;
935
1000
goto fallback;
938
1003
from one of them */
939
1004
for(plugin *proc = plugin_list; proc != NULL;){
940
1005
/* Is this process completely done? */
941
if(proc->eof and proc->completed){
1006
if(proc->completed and proc->eof){
942
1007
/* Only accept the plugin output if it exited cleanly */
943
1008
if(not WIFEXITED(proc->status)
944
1009
or WEXITSTATUS(proc->status) != 0){
945
1010
/* Bad exit by plugin */
946
1011
947
1012
if(debug){
948
1013
if(WIFEXITED(proc->status)){
949
fprintf(stderr, "Plugin %u exited with status %d\n",
950
(unsigned int) (proc->pid),
1014
fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with"
1015
" status %d\n", proc->name,
1016
(intmax_t) (proc->pid),
951
1017
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));
1018
} else if(WIFSIGNALED(proc->status)){
1019
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
1020
" signal %d: %s\n", proc->name,
1021
(intmax_t) (proc->pid),
1022
WTERMSIG(proc->status),
1023
strsignal(WTERMSIG(proc->status)));
956
1024
} else if(WCOREDUMP(proc->status)){
957
fprintf(stderr, "Plugin %d dumped core\n",
958
(unsigned int) (proc->pid));
1025
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1026
" core\n", proc->name, (intmax_t) (proc->pid));
959
1027
}
960
1028
}
961
1029
962
1030
/* Remove the plugin */
963
1031
FD_CLR(proc->fd, &rfds_all);
964
1032
965
1033
/* Block signal while modifying process_list */
966
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1034
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1035
(SIG_BLOCK,
1036
&sigchld_action.sa_mask,
1037
NULL));
967
1038
if(ret < 0){
968
1039
perror("sigprocmask");
969
1040
exitstatus = EXIT_FAILURE;
975
1046
proc = next_plugin;
976
1047
977
1048
/* We are done modifying process list, so unblock signal */
978
ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask,
979
NULL);
1049
ret = (int)(TEMP_FAILURE_RETRY
1050
(sigprocmask(SIG_UNBLOCK,
1051
&sigchld_action.sa_mask, NULL)));
980
1052
if(ret < 0){
981
1053
perror("sigprocmask");
982
1054
exitstatus = EXIT_FAILURE;
1011
1083
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1012
1084
proc->buffer = realloc(proc->buffer, proc->buffer_size
1013
1085
+ (size_t) BUFFER_SIZE);
1014
if (proc->buffer == NULL){
1086
if(proc->buffer == NULL){
1015
1087
perror("malloc");
1016
1088
exitstatus = EXIT_FAILURE;
1017
1089
goto fallback;
1019
1091
proc->buffer_size += BUFFER_SIZE;
1020
1092
}
1021
1093
/* Read from the process */
1022
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1023
BUFFER_SIZE);
1094
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1095
proc->buffer
1096
+ proc->buffer_length,
1097
BUFFER_SIZE));
1024
1098
if(sret < 0){
1025
1099
/* Read error from this process; ignore the error */
1026
1100
proc = proc->next;
1034
1108
}
1035
1109
}
1036
1110
}
1037
1038
1111
1112
1039
1113
fallback:
1040
1114
1041
1115
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1088
1162
}
1089
1163
1090
1164
/* Wait for any remaining child processes to terminate */
1091
do{
1165
do {
1092
1166
ret = wait(NULL);
1093
1167
} while(ret >= 0);
1094
1168
if(errno != ECHILD){
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0