To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to plugin-runner.c
- browse files at revision 237.7.242
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.242
- Committer: Teddy Hogeborn
- Date: 2014-06-08 00:13:06 UTC
- mto: (237.7.272 trunk)
- mto: This revision was merged to the branch mainline in revision 317.
- Revision ID: teddy@recompile.se-20140608001306-ums93iqhkvztj7u1
Make mandos-client use unlinkat() instead of remove().
* plugins.d/mandos-client.d (main): Replace remove() with unlinkat().
* plugins.d/mandos-client.d (main): Replace remove() with unlinkat().
- files added:
- initramfs-tools-hook-conf
- files removed:
- bugs.xml
- debian/tests
- dracut-module
- plugin-helpers
- files modified:
- .bzrignore
added
removed
plugin-runner.c
2
2
/*
3
3
* Mandos plugin runner - Run Mandos plugins
4
4
*
5
* Copyright © 2008-2022 Teddy Hogeborn
6
* Copyright © 2008-2022 Björn Påhlsson
7
*
8
* This file is part of Mandos.
9
*
10
* Mandos is free software: you can redistribute it and/or modify it
11
* under the terms of the GNU General Public License as published by
12
* the Free Software Foundation, either version 3 of the License, or
13
* (at your option) any later version.
14
*
15
* Mandos is distributed in the hope that it will be useful, but
5
* Copyright © 2008-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 Björn Påhlsson
7
*
8
* This program is free software: you can redistribute it and/or
9
* modify it under the terms of the GNU General Public License as
10
* published by the Free Software Foundation, either version 3 of the
11
* License, or (at your option) any later version.
12
*
13
* This program is distributed in the hope that it will be useful, but
16
14
* WITHOUT ANY WARRANTY; without even the implied warranty of
17
15
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18
16
* General Public License for more details.
19
17
*
20
18
* You should have received a copy of the GNU General Public License
21
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
19
* along with this program. If not, see
20
* <http://www.gnu.org/licenses/>.
22
21
*
23
22
* Contact the authors at <mandos@recompile.se>.
24
23
*/
25
24
26
#define _GNU_SOURCE /* strchrnul(), TEMP_FAILURE_RETRY(),
27
getline(), asprintf(), O_CLOEXEC,
28
scandirat(), pipe2() */
29
#include <argp.h> /* argp_program_version,
30
argp_program_bug_address,
31
struct argp_option,
32
struct argp_state, argp_error(),
33
ARGP_NO_EXIT, argp_state_help,
34
ARGP_HELP_STD_HELP,
35
ARGP_HELP_USAGE, ARGP_HELP_EXIT_OK,
36
ARGP_KEY_ARG, ARGP_ERR_UNKNOWN,
37
struct argp, argp_parse(),
38
ARGP_IN_ORDER, ARGP_NO_HELP */
39
#include <stdbool.h> /* bool, false, true */
40
#include <sys/types.h> /* pid_t, sig_atomic_t, uid_t, gid_t,
41
getuid(), setgid(), setuid() */
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
O_CLOEXEC */
42
27
#include <stddef.h> /* size_t, NULL */
43
#include <iso646.h> /* or, and, not */
44
#include <string.h> /* strcmp(), strdup(), strchrnul(),
45
strncmp(), strlen(), strcpy(),
46
strsep(), strchr(), strsignal() */
47
#include <stdlib.h> /* malloc(), free(), reallocarray(),
48
realloc(), EXIT_SUCCESS */
49
#include <errno.h> /* errno, EINTR, ENOMEM, ECHILD,
50
error_t, EINVAL, EMFILE, ENFILE,
51
ENOENT, ESRCH */
52
#include <stdint.h> /* SIZE_MAX */
53
#define _GNU_SOURCE /* strchrnul(), TEMP_FAILURE_RETRY(),
54
getline(), asprintf(), O_CLOEXEC,
55
scandirat(), pipe2() */
56
#include <unistd.h> /* TEMP_FAILURE_RETRY(), ssize_t,
57
write(), STDOUT_FILENO, uid_t,
58
gid_t, getuid(), fchown(), close(),
59
symlink(), setgid(), setuid(),
60
faccessat(), X_OK, pipe(), pipe2(),
61
fork(), _exit(), dup2(), fexecve(),
62
read(), getpass() */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS,
29
realloc() */
30
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* fileno(), fprintf(),
32
stderr, STDOUT_FILENO, fclose() */
33
#include <sys/types.h> /* DIR, fdopendir(), fstat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
37
dirfd() */
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
FD_SET(), FD_ISSET(), FD_CLR */
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
43
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
44
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
readdir(), closedir(), dirfd() */
47
#include <unistd.h> /* fcntl(), F_GETFD, F_SETFD,
48
FD_CLOEXEC, write(), STDOUT_FILENO,
49
struct stat, fstat(), close(),
50
setgid(), setuid(), S_ISREG(),
51
faccessat() pipe(), fork(),
52
_exit(), dup2(), fexecve(), read()
53
*/
63
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
64
FD_CLOEXEC, open(), O_RDONLY,
65
O_CLOEXEC, openat() */
66
#include <sys/wait.h> /* waitpid(), WNOHANG, WIFEXITED(),
67
WEXITSTATUS(), WIFSIGNALED(),
68
WTERMSIG(), wait() */
69
#include <error.h> /* error() */
70
#include <stdio.h> /* FILE, fprintf(), fopen(),
71
getline(), fclose(), EOF,
72
asprintf(), stderr */
73
#include <dirent.h> /* struct dirent, scandirat(),
74
alphasort() */
75
#include <sys/stat.h> /* struct stat, fstat(), S_ISDIR(),
76
lstat(), S_ISREG() */
77
#include <sys/select.h> /* fd_set, FD_ZERO(), FD_SETSIZE,
78
FD_SET(), select(), FD_CLR(),
79
FD_ISSET() */
80
#include <signal.h> /* struct sigaction, SA_NOCLDSTOP,
81
sigemptyset(), sigaddset(),
82
SIGCHLD, sigprocmask(), SIG_BLOCK,
83
SIG_UNBLOCK, kill(), SIGTERM */
55
FD_CLOEXEC, openat() */
56
#include <string.h> /* strsep, strlen(), strsignal(),
57
strcmp(), strncmp() */
58
#include <errno.h> /* errno */
59
#include <argp.h> /* struct argp_option, struct
60
argp_state, struct argp,
61
argp_parse(), ARGP_ERR_UNKNOWN,
62
ARGP_KEY_END, ARGP_KEY_ARG,
63
error_t */
64
#include <signal.h> /* struct sigaction, sigemptyset(),
65
sigaddset(), sigaction(),
66
sigprocmask(), SIG_BLOCK, SIGCHLD,
67
SIG_UNBLOCK, kill(), sig_atomic_t
68
*/
69
#include <errno.h> /* errno, EBADF */
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
84
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
85
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
86
#include <inttypes.h> /* intmax_t, strtoimax(), PRIdMAX */
87
#include <fnmatch.h> /* fnmatch(), FNM_FILE_NAME,
88
FNM_PERIOD, FNM_NOMATCH */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
75
#include <fnmatch.h> /* fnmatch() */
89
76
90
77
#define BUFFER_SIZE 256
91
78
92
79
#define PDIR "/lib/mandos/plugins.d"
93
#define PHDIR "/lib/mandos/plugin-helpers"
94
80
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
95
81
96
82
const char *argp_program_version = "plugin-runner " VERSION;
193
179
/* Resize the pointed-to array to hold one more pointer */
194
180
char **new_array = NULL;
195
181
do {
196
#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 26)
197
new_array = reallocarray(*array, (size_t)((*len) + 2),
198
sizeof(char *));
199
#else
200
if(((size_t)((*len) + 2)) > (SIZE_MAX / sizeof(char *))){
201
/* overflow */
202
new_array = NULL;
203
errno = ENOMEM;
204
} else {
205
new_array = realloc(*array, (size_t)((*len) + 2)
206
* sizeof(char *));
207
}
208
#endif
182
new_array = realloc(*array, sizeof(char *)
183
* (size_t) ((*len) + 2));
209
184
} while(new_array == NULL and errno == EINTR);
210
185
/* Malloc check */
211
186
if(new_array == NULL){
266
241
return add_to_char_array(def, &(p->environ), &(p->envc));
267
242
}
268
243
269
#ifndef O_CLOEXEC
270
244
/*
271
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
272
246
* Descriptor Flags".
283
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
284
258
ret | FD_CLOEXEC));
285
259
}
286
#endif /* not O_CLOEXEC */
287
260
288
261
289
262
/* Mark processes as completed when they exit, and save their exit
338
311
__attribute__((nonnull))
339
312
static void free_plugin(plugin *plugin_node){
340
313
341
for(char **arg = (plugin_node->argv)+1; *arg != NULL; arg++){
314
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
342
315
free(*arg);
343
316
}
344
free(plugin_node->name);
345
317
free(plugin_node->argv);
346
318
for(char **env = plugin_node->environ; *env != NULL; env++){
347
319
free(*env);
374
346
375
347
int main(int argc, char *argv[]){
376
348
char *plugindir = NULL;
377
char *pluginhelperdir = NULL;
378
349
char *argfile = NULL;
379
350
FILE *conffp;
380
struct dirent **direntries = NULL;
351
DIR *dir = NULL;
352
struct dirent *dirst;
381
353
struct stat st;
382
354
fd_set rfds_all;
383
355
int ret, maxfd = 0;
391
363
.sa_flags = SA_NOCLDSTOP };
392
364
char **custom_argv = NULL;
393
365
int custom_argc = 0;
394
int dir_fd = -1;
366
int dir_fd;
395
367
396
368
/* Establish a signal handler */
397
369
sigemptyset(&sigchld_action.sa_mask);
442
414
.doc = "Group ID the plugins will run as", .group = 3 },
443
415
{ .name = "debug", .key = 132,
444
416
.doc = "Debug mode", .group = 4 },
445
{ .name = "plugin-helper-dir", .key = 133,
446
.arg = "DIRECTORY",
447
.doc = "Specify a different plugin helper directory",
448
.group = 2 },
449
417
/*
450
418
* These reproduce what we would get without ARGP_NO_HELP
451
419
*/
577
545
case 132: /* --debug */
578
546
debug = true;
579
547
break;
580
case 133: /* --plugin-helper-dir */
581
free(pluginhelperdir);
582
pluginhelperdir = strdup(arg);
583
if(pluginhelperdir != NULL){
584
errno = 0;
585
}
586
break;
587
548
/*
588
549
* These reproduce what we would get without ARGP_NO_HELP
589
550
*/
590
551
case '?': /* --help */
591
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
592
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
593
__builtin_unreachable();
594
554
case -3: /* --usage */
595
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
596
556
argp_state_help(state, state->out_stream,
597
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
598
__builtin_unreachable();
599
558
case 'V': /* --version */
600
559
fprintf(state->out_stream, "%s\n", argp_program_version);
601
560
exit(EXIT_SUCCESS);
611
570
if(arg[0] == '\0'){
612
571
break;
613
572
}
614
#if __GNUC__ >= 7
615
__attribute__((fallthrough));
616
#else
617
/* FALLTHROUGH */
618
#endif
619
573
default:
620
574
return ARGP_ERR_UNKNOWN;
621
575
}
647
601
case 130: /* --userid */
648
602
case 131: /* --groupid */
649
603
case 132: /* --debug */
650
case 133: /* --plugin-helper-dir */
651
604
case '?': /* --help */
652
605
case -3: /* --usage */
653
606
case 'V': /* --version */
733
686
734
687
custom_argc += 1;
735
688
{
736
#if defined(__GLIBC_PREREQ) and __GLIBC_PREREQ(2, 26)
737
char **new_argv = reallocarray(custom_argv,
738
(size_t)custom_argc + 1,
739
sizeof(char *));
740
#else
741
char **new_argv = NULL;
742
if(((size_t)custom_argc + 1) > (SIZE_MAX / sizeof(char *))){
743
/* overflow */
744
errno = ENOMEM;
745
} else {
746
new_argv = realloc(custom_argv, ((size_t)custom_argc + 1)
747
* sizeof(char *));
748
}
749
#endif
689
char **new_argv = realloc(custom_argv, sizeof(char *)
690
* ((unsigned int)
691
custom_argc + 1));
750
692
if(new_argv == NULL){
751
error(0, errno, "reallocarray");
693
error(0, errno, "realloc");
752
694
exitstatus = EX_OSERR;
753
695
free(new_arg);
754
696
free(org_line);
819
761
goto fallback;
820
762
}
821
763
822
{
823
char *pluginhelperenv;
824
bool bret = true;
825
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
826
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
827
if(ret != -1){
828
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
829
}
830
if(ret == -1 or not bret){
831
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
832
" environment variable to \"%s\" for all plugins\n",
833
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
834
}
835
if(ret != -1){
836
free(pluginhelperenv);
837
}
838
}
839
840
764
if(debug){
841
for(plugin *p = plugin_list; p != NULL; p = p->next){
765
for(plugin *p = plugin_list; p != NULL; p=p->next){
842
766
fprintf(stderr, "Plugin: %s has %d arguments\n",
843
767
p->name ? p->name : "Global", p->argc - 1);
844
768
for(char **a = p->argv; *a != NULL; a++){
853
777
854
778
if(getuid() == 0){
855
779
/* Work around Debian bug #633582:
856
<https://bugs.debian.org/633582> */
780
<http://bugs.debian.org/633582> */
857
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
858
782
if(plugindir_fd == -1){
859
783
if(errno != ENOENT){
871
795
}
872
796
}
873
797
}
874
close(plugindir_fd);
875
}
876
877
/* Work around Debian bug #981302
878
<https://bugs.debian.org/981302> */
879
if(lstat("/dev/fd", &st) != 0 and errno == ENOENT){
880
ret = symlink("/proc/self/fd", "/dev/fd");
881
if(ret == -1){
882
error(0, errno, "Failed to create /dev/fd symlink");
883
}
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
884
799
}
885
800
}
886
801
914
829
ret = set_cloexec_flag(dir_fd);
915
830
if(ret < 0){
916
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
917
833
exitstatus = EX_OSERR;
918
834
goto fallback;
919
835
}
920
836
#endif /* O_CLOEXEC */
837
838
dir = fdopendir(dir_fd);
839
if(dir == NULL){
840
error(0, errno, "Could not open plugin dir");
841
TEMP_FAILURE_RETRY(close(dir_fd));
842
exitstatus = EX_OSERR;
843
goto fallback;
844
}
921
845
}
922
846
923
int good_name(const struct dirent * const dirent){
924
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
925
"*.dpkg-old", "*.dpkg-bak",
926
"*.dpkg-divert", NULL };
847
FD_ZERO(&rfds_all);
848
849
/* Read and execute any executable in the plugin directory*/
850
while(true){
851
do {
852
dirst = readdir(dir);
853
} while(dirst == NULL and errno == EINTR);
854
855
/* All directory entries have been processed */
856
if(dirst == NULL){
857
if(errno == EBADF){
858
error(0, errno, "readdir");
859
exitstatus = EX_IOERR;
860
goto fallback;
861
}
862
break;
863
}
864
865
/* Ignore dotfiles, backup files and other junk */
866
{
867
bool bad_name = false;
868
const char * const patterns[] = { ".*", "#*#", "*~",
869
"*.dpkg-new", "*.dpkg-old",
870
"*.dpkg-bak", "*.dpkg-divert",
871
NULL };
927
872
#ifdef __GNUC__
928
873
#pragma GCC diagnostic push
929
874
#pragma GCC diagnostic ignored "-Wcast-qual"
930
875
#endif
931
for(const char **pat = (const char **)patterns;
932
*pat != NULL; pat++){
876
for(const char **pat = (const char **)patterns;
877
*pat != NULL; pat++){
933
878
#ifdef __GNUC__
934
879
#pragma GCC diagnostic pop
935
880
#endif
936
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
937
!= FNM_NOMATCH){
938
if(debug){
881
if(fnmatch(*pat, dirst->d_name,
882
FNM_FILE_NAME | FNM_PERIOD) != FNM_NOMATCH){
883
if(debug){
939
884
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
940
" matching pattern %s\n", dirent->d_name, *pat);
885
" matching pattern %s\n", dirst->d_name, *pat);
886
}
887
bad_name = true;
888
break;
941
889
}
942
return 0;
890
}
891
if(bad_name){
892
continue;
943
893
}
944
894
}
945
return 1;
946
}
947
948
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
949
alphasort);
950
if(numplugins == -1){
951
error(0, errno, "Could not scan plugin dir");
952
direntries = NULL;
953
exitstatus = EX_OSERR;
954
goto fallback;
955
}
956
957
FD_ZERO(&rfds_all);
958
959
/* Read and execute any executable in the plugin directory*/
960
for(int i = 0; i < numplugins; i++){
961
895
962
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
896
int plugin_fd = openat(dir_fd, dirst->d_name, O_RDONLY |
897
#ifdef O_CLOEXEC
898
O_CLOEXEC
899
#else /* not O_CLOEXEC */
900
0
901
#endif /* not O_CLOEXEC */
902
);
963
903
if(plugin_fd == -1){
964
904
error(0, errno, "Could not open plugin");
965
free(direntries[i]);
966
continue;
967
}
905
continue;
906
}
907
#ifndef O_CLOEXEC
908
/* Set the FD_CLOEXEC flag on the plugin FD */
909
ret = set_cloexec_flag(plugin_fd);
910
if(ret < 0){
911
error(0, errno, "set_cloexec_flag");
912
TEMP_FAILURE_RETRY(close(plugin_fd));
913
continue;
914
}
915
#endif /* O_CLOEXEC */
968
916
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
969
917
if(ret == -1){
970
918
error(0, errno, "stat");
971
close(plugin_fd);
972
free(direntries[i]);
919
TEMP_FAILURE_RETRY(close(plugin_fd));
973
920
continue;
974
921
}
975
922
976
923
/* Ignore non-executable files */
977
924
if(not S_ISREG(st.st_mode)
978
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
979
X_OK, 0)) != 0)){
925
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, dirst->d_name, X_OK,
926
0)) != 0)){
980
927
if(debug){
981
928
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
982
929
" with bad type or mode\n",
983
plugindir != NULL ? plugindir : PDIR,
984
direntries[i]->d_name);
930
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
985
931
}
986
close(plugin_fd);
987
free(direntries[i]);
932
TEMP_FAILURE_RETRY(close(plugin_fd));
988
933
continue;
989
934
}
990
935
991
plugin *p = getplugin(direntries[i]->d_name);
936
plugin *p = getplugin(dirst->d_name);
992
937
if(p == NULL){
993
938
error(0, errno, "getplugin");
994
close(plugin_fd);
995
free(direntries[i]);
939
TEMP_FAILURE_RETRY(close(plugin_fd));
996
940
continue;
997
941
}
998
942
if(p->disabled){
999
943
if(debug){
1000
944
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
1001
direntries[i]->d_name);
945
dirst->d_name);
1002
946
}
1003
close(plugin_fd);
1004
free(direntries[i]);
947
TEMP_FAILURE_RETRY(close(plugin_fd));
1005
948
continue;
1006
949
}
1007
950
{
1032
975
}
1033
976
1034
977
int pipefd[2];
1035
#ifndef O_CLOEXEC
1036
978
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1037
#else /* O_CLOEXEC */
1038
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
1039
#endif /* O_CLOEXEC */
1040
979
if(ret == -1){
1041
980
error(0, errno, "pipe");
1042
981
exitstatus = EX_OSERR;
1043
free(direntries[i]);
1044
goto fallback;
1045
}
1046
if(pipefd[0] >= FD_SETSIZE){
1047
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1048
FD_SETSIZE);
1049
close(pipefd[0]);
1050
close(pipefd[1]);
1051
exitstatus = EX_OSERR;
1052
free(direntries[i]);
1053
goto fallback;
1054
}
1055
#ifndef O_CLOEXEC
982
goto fallback;
983
}
1056
984
/* Ask OS to automatic close the pipe on exec */
1057
985
ret = set_cloexec_flag(pipefd[0]);
1058
986
if(ret < 0){
1059
987
error(0, errno, "set_cloexec_flag");
1060
close(pipefd[0]);
1061
close(pipefd[1]);
1062
988
exitstatus = EX_OSERR;
1063
free(direntries[i]);
1064
989
goto fallback;
1065
990
}
1066
991
ret = set_cloexec_flag(pipefd[1]);
1067
992
if(ret < 0){
1068
993
error(0, errno, "set_cloexec_flag");
1069
close(pipefd[0]);
1070
close(pipefd[1]);
1071
994
exitstatus = EX_OSERR;
1072
free(direntries[i]);
1073
995
goto fallback;
1074
996
}
1075
#endif /* not O_CLOEXEC */
1076
997
/* Block SIGCHLD until process is safely in process list */
1077
998
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1078
999
&sigchld_action.sa_mask,
1080
1001
if(ret < 0){
1081
1002
error(0, errno, "sigprocmask");
1082
1003
exitstatus = EX_OSERR;
1083
free(direntries[i]);
1084
1004
goto fallback;
1085
1005
}
1086
1006
/* Starting a new process to be watched */
1090
1010
} while(pid == -1 and errno == EINTR);
1091
1011
if(pid == -1){
1092
1012
error(0, errno, "fork");
1093
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1094
&sigchld_action.sa_mask, NULL));
1095
close(pipefd[0]);
1096
close(pipefd[1]);
1097
1013
exitstatus = EX_OSERR;
1098
free(direntries[i]);
1099
1014
goto fallback;
1100
1015
}
1101
1016
if(pid == 0){
1117
1032
_exit(EX_OSERR);
1118
1033
}
1119
1034
1035
if(dirfd(dir) < 0){
1036
/* If dir has no file descriptor, we could not set FD_CLOEXEC
1037
above and must now close it manually here. */
1038
closedir(dir);
1039
}
1120
1040
if(fexecve(plugin_fd, p->argv,
1121
1041
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1122
1042
error(0, errno, "fexecve for %s/%s",
1123
plugindir != NULL ? plugindir : PDIR,
1124
direntries[i]->d_name);
1043
plugindir != NULL ? plugindir : PDIR, dirst->d_name);
1125
1044
_exit(EX_OSERR);
1126
1045
}
1127
1046
/* no return */
1128
1047
}
1129
1048
/* Parent process */
1130
close(pipefd[1]); /* Close unused write end of pipe */
1131
close(plugin_fd);
1132
plugin *new_plugin = getplugin(direntries[i]->d_name);
1049
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1050
pipe */
1051
TEMP_FAILURE_RETRY(close(plugin_fd));
1052
plugin *new_plugin = getplugin(dirst->d_name);
1133
1053
if(new_plugin == NULL){
1134
1054
error(0, errno, "getplugin");
1135
1055
ret = (int)(TEMP_FAILURE_RETRY
1139
1059
error(0, errno, "sigprocmask");
1140
1060
}
1141
1061
exitstatus = EX_OSERR;
1142
free(direntries[i]);
1143
1062
goto fallback;
1144
1063
}
1145
free(direntries[i]);
1146
1064
1147
1065
new_plugin->pid = pid;
1148
1066
new_plugin->fd = pipefd[0];
1149
1150
if(debug){
1151
fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1152
new_plugin->name, (intmax_t) (new_plugin->pid));
1153
}
1154
1067
1155
1068
/* Unblock SIGCHLD so signal handler can be run if this process
1156
1069
has already completed */
1157
1070
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1163
1076
goto fallback;
1164
1077
}
1165
1078
1166
FD_SET(new_plugin->fd, &rfds_all);
1079
#if defined (__GNUC__) and defined (__GLIBC__)
1080
#if not __GLIBC_PREREQ(2, 16)
1081
#pragma GCC diagnostic push
1082
#pragma GCC diagnostic ignored "-Wsign-conversion"
1083
#endif
1084
#endif
1085
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1086
-Wconversion in GNU libc
1087
before 2.16 */
1088
#if defined (__GNUC__) and defined (__GLIBC__)
1089
#if not __GLIBC_PREREQ(2, 16)
1090
#pragma GCC diagnostic pop
1091
#endif
1092
#endif
1167
1093
1168
1094
if(maxfd < new_plugin->fd){
1169
1095
maxfd = new_plugin->fd;
1170
1096
}
1171
1097
}
1172
1098
1173
free(direntries);
1174
direntries = NULL;
1175
close(dir_fd);
1176
dir_fd = -1;
1099
TEMP_FAILURE_RETRY(closedir(dir));
1100
dir = NULL;
1177
1101
free_plugin(getplugin(NULL));
1178
1102
1179
1103
for(plugin *p = plugin_list; p != NULL; p = p->next){
1218
1142
(intmax_t) (proc->pid),
1219
1143
WTERMSIG(proc->status),
1220
1144
strsignal(WTERMSIG(proc->status)));
1145
} else if(WCOREDUMP(proc->status)){
1146
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1147
" core\n", proc->name, (intmax_t) (proc->pid));
1221
1148
}
1222
1149
}
1223
1150
1224
1151
/* Remove the plugin */
1225
FD_CLR(proc->fd, &rfds_all);
1152
#if defined (__GNUC__) and defined (__GLIBC__)
1153
#if not __GLIBC_PREREQ(2, 16)
1154
#pragma GCC diagnostic push
1155
#pragma GCC diagnostic ignored "-Wsign-conversion"
1156
#endif
1157
#endif
1158
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1159
-Wconversion in GNU libc
1160
before 2.16 */
1161
#if defined (__GNUC__) and defined (__GLIBC__)
1162
#if not __GLIBC_PREREQ(2, 16)
1163
#pragma GCC diagnostic pop
1164
#endif
1165
#endif
1226
1166
1227
1167
/* Block signal while modifying process_list */
1228
1168
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1268
1208
}
1269
1209
1270
1210
/* This process has not completed. Does it have any output? */
1271
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1211
#if defined (__GNUC__) and defined (__GLIBC__)
1212
#if not __GLIBC_PREREQ(2, 16)
1213
#pragma GCC diagnostic push
1214
#pragma GCC diagnostic ignored "-Wsign-conversion"
1215
#endif
1216
#endif
1217
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1218
warning from
1219
-Wconversion
1220
in GNU libc
1221
before
1222
2.16 */
1223
#if defined (__GNUC__) and defined (__GLIBC__)
1224
#if not __GLIBC_PREREQ(2, 16)
1225
#pragma GCC diagnostic pop
1226
#endif
1227
#endif
1272
1228
/* This process had nothing to say at this time */
1273
1229
proc = proc->next;
1274
1230
continue;
1341
1297
free(custom_argv);
1342
1298
}
1343
1299
1344
free(direntries);
1345
1346
if(dir_fd != -1){
1347
close(dir_fd);
1300
if(dir != NULL){
1301
closedir(dir);
1348
1302
}
1349
1303
1350
1304
/* Kill the processes */
1370
1324
free_plugin_list();
1371
1325
1372
1326
free(plugindir);
1373
free(pluginhelperdir);
1374
1327
free(argfile);
1375
1328
1376
1329
return exitstatus;
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0