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 703
- compare with another revision
- download diff
- download tarball
- view history from revision 703
- Committer: Teddy Hogeborn
- Date: 2014-06-14 22:55:11 UTC
- Revision ID: teddy@recompile.se-20140614225511-0ge6tce2esulf65t
In plugin-runner, do scandirat() or scandir() instead of readdir().
* plugin-runner.c (set_cloexec_flag): Only define if O_CLOEXEC is not
defined, it is not called
otherwise.
(main): Remove variables "dir" and "dirst"; new variable "dir_fd".
Use scandirat() if available, scandir() otherwise, both
using new filter function "good_name". Removed checking of
plugin file name patterns; this is now done by "good_name".
Do not set FD_CLOEXEC flag on plugin_fd, since fexecve()
will not work with it. Use pipe2() to set O_CLOEXEC on pipe
FD's (if possible).
(main/good_name): New filter function for scandirat() or scandir().
* plugin-runner.c (set_cloexec_flag): Only define if O_CLOEXEC is not
defined, it is not called
otherwise.
(main): Remove variables "dir" and "dirst"; new variable "dir_fd".
Use scandirat() if available, scandir() otherwise, both
using new filter function "good_name". Removed checking of
plugin file name patterns; this is now done by "good_name".
Do not set FD_CLOEXEC flag on plugin_fd, since fexecve()
will not work with it. Use pipe2() to set O_CLOEXEC on pipe
FD's (if possible).
(main/good_name): New filter function for scandirat() or scandir().
- files added:
- DBUS-API
- debian/source
- debian/upstream
- network-hooks.d
- files modified:
- .bzrignore
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
*
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
5
* Copyright © 2008-2014 Teddy Hogeborn
6
* Copyright © 2008-2014 Björn Påhlsson
7
7
*
8
8
* This program is free software: you can redistribute it and/or
9
9
* modify it under the terms of the GNU General Public License as
19
19
* along with this program. If not, see
20
20
* <http://www.gnu.org/licenses/>.
21
21
*
22
* Contact the authors at <mandos@fukt.bsnet.se>.
22
* Contact the authors at <mandos@recompile.se>.
23
23
*/
24
24
25
25
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf() */
26
O_CLOEXEC, pipe2() */
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,
29
realloc() */
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(),
37
dirfd() */
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(),
36
getgid() */
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(),
41
WEXITSTATUS() */
42
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
40
WEXITSTATUS(), WTERMSIG(),
41
WCOREDUMP() */
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(),
52
close() */
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()
51
*/
53
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
FD_CLOEXEC */
55
#include <string.h> /* strsep, strlen(), asprintf() */
53
FD_CLOEXEC, openat(), scandirat(),
54
pipe2() */
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,
66
67
*/
67
68
#include <errno.h> /* errno, EBADF */
68
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
75
70
76
#define BUFFER_SIZE 256
71
77
73
79
#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
74
80
75
81
const char *argp_program_version = "plugin-runner " VERSION;
76
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
82
const char *argp_program_bug_address = "<mandos@recompile.se>";
77
83
78
84
typedef struct plugin{
79
85
char *name; /* can be NULL or any plugin name */
99
105
100
106
/* Gets an existing plugin based on name,
101
107
or if none is found, creates a new one */
108
__attribute__((warn_unused_result))
102
109
static plugin *getplugin(char *name){
103
/* Check for exiting plugin with that name */
110
/* Check for existing plugin with that name */
104
111
for(plugin *p = plugin_list; p != NULL; p = p->next){
105
112
if((p->name == name)
106
113
or (p->name and name and (strcmp(p->name, name) == 0))){
108
115
}
109
116
}
110
117
/* Create a new plugin */
111
plugin *new_plugin = malloc(sizeof(plugin));
118
plugin *new_plugin = NULL;
119
do {
120
new_plugin = malloc(sizeof(plugin));
121
} while(new_plugin == NULL and errno == EINTR);
112
122
if(new_plugin == NULL){
113
123
return NULL;
114
124
}
115
125
char *copy_name = NULL;
116
126
if(name != NULL){
117
copy_name = strdup(name);
127
do {
128
copy_name = strdup(name);
129
} while(copy_name == NULL and errno == EINTR);
118
130
if(copy_name == NULL){
131
int e = errno;
119
132
free(new_plugin);
133
errno = e;
120
134
return NULL;
121
135
}
122
136
}
126
140
.disabled = false,
127
141
.next = plugin_list };
128
142
129
new_plugin->argv = malloc(sizeof(char *) * 2);
143
do {
144
new_plugin->argv = malloc(sizeof(char *) * 2);
145
} while(new_plugin->argv == NULL and errno == EINTR);
130
146
if(new_plugin->argv == NULL){
147
int e = errno;
131
148
free(copy_name);
132
149
free(new_plugin);
150
errno = e;
133
151
return NULL;
134
152
}
135
153
new_plugin->argv[0] = copy_name;
136
154
new_plugin->argv[1] = NULL;
137
155
138
new_plugin->environ = malloc(sizeof(char *));
156
do {
157
new_plugin->environ = malloc(sizeof(char *));
158
} while(new_plugin->environ == NULL and errno == EINTR);
139
159
if(new_plugin->environ == NULL){
160
int e = errno;
140
161
free(copy_name);
141
162
free(new_plugin->argv);
142
163
free(new_plugin);
164
errno = e;
143
165
return NULL;
144
166
}
145
167
new_plugin->environ[0] = NULL;
150
172
}
151
173
152
174
/* Helper function for add_argument and add_environment */
175
__attribute__((nonnull, warn_unused_result))
153
176
static bool add_to_char_array(const char *new, char ***array,
154
177
int *len){
155
178
/* Resize the pointed-to array to hold one more pointer */
156
*array = realloc(*array, sizeof(char *)
157
* (size_t) ((*len) + 2));
179
char **new_array = NULL;
180
do {
181
new_array = realloc(*array, sizeof(char *)
182
* (size_t) ((*len) + 2));
183
} while(new_array == NULL and errno == EINTR);
158
184
/* Malloc check */
159
if(*array == NULL){
185
if(new_array == NULL){
160
186
return false;
161
187
}
188
*array = new_array;
162
189
/* Make a copy of the new string */
163
char *copy = strdup(new);
190
char *copy;
191
do {
192
copy = strdup(new);
193
} while(copy == NULL and errno == EINTR);
164
194
if(copy == NULL){
165
195
return false;
166
196
}
173
203
}
174
204
175
205
/* Add to a plugin's argument vector */
206
__attribute__((nonnull(2), warn_unused_result))
176
207
static bool add_argument(plugin *p, const char *arg){
177
208
if(p == NULL){
178
209
return false;
181
212
}
182
213
183
214
/* Add to a plugin's environment */
215
__attribute__((nonnull(2), warn_unused_result))
184
216
static bool add_environment(plugin *p, const char *def, bool replace){
185
217
if(p == NULL){
186
218
return false;
188
220
/* namelen = length of name of environment variable */
189
221
size_t namelen = (size_t)(strchrnul(def, '=') - def);
190
222
/* Search for this environment variable */
191
for(char **e = p->environ; *e != NULL; e++){
192
if(strncmp(*e, def, namelen + 1) == 0){
223
for(char **envdef = p->environ; *envdef != NULL; envdef++){
224
if(strncmp(*envdef, def, namelen + 1) == 0){
193
225
/* It already exists */
194
226
if(replace){
195
char *new = realloc(*e, strlen(def) + 1);
196
if(new == NULL){
227
char *new_envdef;
228
do {
229
new_envdef = realloc(*envdef, strlen(def) + 1);
230
} while(new_envdef == NULL and errno == EINTR);
231
if(new_envdef == NULL){
197
232
return false;
198
233
}
199
*e = new;
200
strcpy(*e, def);
234
*envdef = new_envdef;
235
strcpy(*envdef, def);
201
236
}
202
237
return true;
203
238
}
205
240
return add_to_char_array(def, &(p->environ), &(p->envc));
206
241
}
207
242
243
#ifndef O_CLOEXEC
208
244
/*
209
245
* Based on the example in the GNU LibC manual chapter 13.13 "File
210
246
* Descriptor Flags".
211
* *Note File Descriptor Flags:(libc)Descriptor Flags.
247
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
212
248
*/
249
__attribute__((warn_unused_result))
213
250
static int set_cloexec_flag(int fd){
214
int ret = fcntl(fd, F_GETFD, 0);
251
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
215
252
/* If reading the flags failed, return error indication now. */
216
253
if(ret < 0){
217
254
return ret;
218
255
}
219
256
/* Store modified flag word in the descriptor. */
220
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
257
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
258
ret | FD_CLOEXEC));
221
259
}
260
#endif /* not O_CLOEXEC */
222
261
223
262
224
263
/* Mark processes as completed when they exit, and save their exit
238
277
/* No child processes */
239
278
break;
240
279
}
241
perror("waitpid");
280
error(0, errno, "waitpid");
242
281
}
243
282
244
283
/* A child exited, find it in process_list */
256
295
}
257
296
258
297
/* Prints out a password to stdout */
298
__attribute__((nonnull, warn_unused_result))
259
299
static bool print_out_password(const char *buffer, size_t length){
260
300
ssize_t ret;
261
301
for(size_t written = 0; written < length; written += (size_t)ret){
269
309
}
270
310
271
311
/* Removes and free a plugin from the plugin list */
312
__attribute__((nonnull))
272
313
static void free_plugin(plugin *plugin_node){
273
314
274
315
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
308
349
char *plugindir = NULL;
309
350
char *argfile = NULL;
310
351
FILE *conffp;
311
size_t d_name_len;
312
DIR *dir = NULL;
313
struct dirent *dirst;
352
struct dirent **direntries;
314
353
struct stat st;
315
354
fd_set rfds_all;
316
355
int ret, maxfd = 0;
317
356
ssize_t sret;
318
intmax_t tmpmax;
319
357
uid_t uid = 65534;
320
358
gid_t gid = 65534;
321
359
bool debug = false;
325
363
.sa_flags = SA_NOCLDSTOP };
326
364
char **custom_argv = NULL;
327
365
int custom_argc = 0;
366
int dir_fd = -1;
328
367
329
368
/* Establish a signal handler */
330
369
sigemptyset(&sigchld_action.sa_mask);
331
370
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
332
371
if(ret == -1){
333
perror("sigaddset");
334
exitstatus = EXIT_FAILURE;
372
error(0, errno, "sigaddset");
373
exitstatus = EX_OSERR;
335
374
goto fallback;
336
375
}
337
376
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
338
377
if(ret == -1){
339
perror("sigaction");
340
exitstatus = EXIT_FAILURE;
378
error(0, errno, "sigaction");
379
exitstatus = EX_OSERR;
341
380
goto fallback;
342
381
}
343
382
375
414
.doc = "Group ID the plugins will run as", .group = 3 },
376
415
{ .name = "debug", .key = 132,
377
416
.doc = "Debug mode", .group = 4 },
417
/*
418
* These reproduce what we would get without ARGP_NO_HELP
419
*/
420
{ .name = "help", .key = '?',
421
.doc = "Give this help list", .group = -1 },
422
{ .name = "usage", .key = -3,
423
.doc = "Give a short usage message", .group = -1 },
424
{ .name = "version", .key = 'V',
425
.doc = "Print program version", .group = -1 },
378
426
{ .name = NULL }
379
427
};
380
428
381
error_t parse_opt(int key, char *arg, __attribute__((unused))
382
struct argp_state *state){
383
char *tmp;
429
__attribute__((nonnull(3)))
430
error_t parse_opt(int key, char *arg, struct argp_state *state){
431
errno = 0;
384
432
switch(key){
433
char *tmp;
434
intmax_t tmp_id;
385
435
case 'g': /* --global-options */
386
if(arg != NULL){
436
{
387
437
char *plugin_option;
388
438
while((plugin_option = strsep(&arg, ",")) != NULL){
389
if(plugin_option[0] == '\0'){
390
continue;
391
}
392
439
if(not add_argument(getplugin(NULL), plugin_option)){
393
perror("add_argument");
394
return ARGP_ERR_UNKNOWN;
440
break;
395
441
}
396
442
}
443
errno = 0;
397
444
}
398
445
break;
399
446
case 'G': /* --global-env */
400
if(arg == NULL){
401
break;
402
}
403
if(not add_environment(getplugin(NULL), arg, true)){
404
perror("add_environment");
447
if(add_environment(getplugin(NULL), arg, true)){
448
errno = 0;
405
449
}
406
450
break;
407
451
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;
452
{
453
char *option_list = strchr(arg, ':');
454
if(option_list == NULL){
455
argp_error(state, "No colon in \"%s\"", arg);
456
errno = EINVAL;
457
break;
458
}
459
*option_list = '\0';
460
option_list++;
461
if(arg[0] == '\0'){
462
argp_error(state, "Empty plugin name");
463
errno = EINVAL;
464
break;
465
}
466
char *option;
467
while((option = strsep(&option_list, ",")) != NULL){
468
if(not add_argument(getplugin(arg), option)){
469
break;
418
470
}
419
471
}
472
errno = 0;
420
473
}
421
474
break;
422
475
case 'E': /* --env-for */
423
if(arg == NULL){
424
break;
425
}
426
476
{
427
477
char *envdef = strchr(arg, ':');
428
478
if(envdef == NULL){
479
argp_error(state, "No colon in \"%s\"", arg);
480
errno = EINVAL;
429
481
break;
430
482
}
431
483
*envdef = '\0';
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
484
envdef++;
485
if(arg[0] == '\0'){
486
argp_error(state, "Empty plugin name");
487
errno = EINVAL;
488
break;
489
}
490
if(add_environment(getplugin(arg), envdef, true)){
491
errno = 0;
434
492
}
435
493
}
436
494
break;
437
495
case 'd': /* --disable */
438
if(arg != NULL){
496
{
439
497
plugin *p = getplugin(arg);
440
if(p == NULL){
441
return ARGP_ERR_UNKNOWN;
498
if(p != NULL){
499
p->disabled = true;
500
errno = 0;
442
501
}
443
p->disabled = true;
444
502
}
445
503
break;
446
504
case 'e': /* --enable */
447
if(arg != NULL){
505
{
448
506
plugin *p = getplugin(arg);
449
if(p == NULL){
450
return ARGP_ERR_UNKNOWN;
507
if(p != NULL){
508
p->disabled = false;
509
errno = 0;
451
510
}
452
p->disabled = false;
453
511
}
454
512
break;
455
513
case 128: /* --plugin-dir */
456
514
free(plugindir);
457
515
plugindir = strdup(arg);
458
if(plugindir == NULL){
459
perror("strdup");
460
}
516
if(plugindir != NULL){
517
errno = 0;
518
}
461
519
break;
462
520
case 129: /* --config-file */
463
521
/* This is already done by parse_opt_config_file() */
464
522
break;
465
523
case 130: /* --userid */
466
errno = 0;
467
tmpmax = strtoimax(arg, &tmp, 10);
524
tmp_id = strtoimax(arg, &tmp, 10);
468
525
if(errno != 0 or tmp == arg or *tmp != '\0'
469
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;
526
or tmp_id != (uid_t)tmp_id){
527
argp_error(state, "Bad user ID number: \"%s\", using %"
528
PRIdMAX, arg, (intmax_t)uid);
529
break;
474
530
}
531
uid = (uid_t)tmp_id;
532
errno = 0;
475
533
break;
476
534
case 131: /* --groupid */
477
errno = 0;
478
tmpmax = strtoimax(arg, &tmp, 10);
535
tmp_id = strtoimax(arg, &tmp, 10);
479
536
if(errno != 0 or tmp == arg or *tmp != '\0'
480
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;
537
or tmp_id != (gid_t)tmp_id){
538
argp_error(state, "Bad group ID number: \"%s\", using %"
539
PRIdMAX, arg, (intmax_t)gid);
540
break;
485
541
}
542
gid = (gid_t)tmp_id;
543
errno = 0;
486
544
break;
487
545
case 132: /* --debug */
488
546
debug = true;
489
547
break;
548
/*
549
* These reproduce what we would get without ARGP_NO_HELP
550
*/
551
case '?': /* --help */
552
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
553
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
554
case -3: /* --usage */
555
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
556
argp_state_help(state, state->out_stream,
557
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
558
case 'V': /* --version */
559
fprintf(state->out_stream, "%s\n", argp_program_version);
560
exit(EXIT_SUCCESS);
561
break;
490
562
/*
491
563
* When adding more options before this line, remember to also add a
492
564
* "case" to the "parse_opt_config_file" function below.
495
567
/* Cryptsetup always passes an argument, which is an empty
496
568
string if "none" was specified in /etc/crypttab. So if
497
569
argument was empty, we ignore it silently. */
498
if(arg[0] != '\0'){
499
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
570
if(arg[0] == '\0'){
571
break;
500
572
}
501
break;
502
case ARGP_KEY_END:
503
break;
504
573
default:
505
574
return ARGP_ERR_UNKNOWN;
506
575
}
507
return 0;
576
return errno; /* Set to 0 at start */
508
577
}
509
578
510
579
/* This option parser is the same as parse_opt() above, except it
512
581
error_t parse_opt_config_file(int key, char *arg,
513
582
__attribute__((unused))
514
583
struct argp_state *state){
584
errno = 0;
515
585
switch(key){
516
586
case 'g': /* --global-options */
517
587
case 'G': /* --global-env */
524
594
case 129: /* --config-file */
525
595
free(argfile);
526
596
argfile = strdup(arg);
527
if(argfile == NULL){
528
perror("strdup");
597
if(argfile != NULL){
598
errno = 0;
529
599
}
530
break;
600
break;
531
601
case 130: /* --userid */
532
602
case 131: /* --groupid */
533
603
case 132: /* --debug */
604
case '?': /* --help */
605
case -3: /* --usage */
606
case 'V': /* --version */
534
607
case ARGP_KEY_ARG:
535
case ARGP_KEY_END:
536
608
break;
537
609
default:
538
610
return ARGP_ERR_UNKNOWN;
539
611
}
540
return 0;
612
return errno;
541
613
}
542
614
543
615
struct argp argp = { .options = options,
547
619
548
620
/* Parse using parse_opt_config_file() in order to get the custom
549
621
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;
622
ret = argp_parse(&argp, argc, argv,
623
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
624
NULL, NULL);
625
switch(ret){
626
case 0:
627
break;
628
case ENOMEM:
629
default:
630
errno = ret;
631
error(0, errno, "argp_parse");
632
exitstatus = EX_OSERR;
633
goto fallback;
634
case EINVAL:
635
exitstatus = EX_USAGE;
554
636
goto fallback;
555
637
}
556
638
562
644
conffp = fopen(AFILE, "r");
563
645
} else {
564
646
conffp = fopen(argfile, "r");
565
}
647
}
566
648
if(conffp != NULL){
567
649
char *org_line = NULL;
568
650
char *p, *arg, *new_arg, *line;
573
655
custom_argc = 1;
574
656
custom_argv = malloc(sizeof(char*) * 2);
575
657
if(custom_argv == NULL){
576
perror("malloc");
577
exitstatus = EXIT_FAILURE;
658
error(0, errno, "malloc");
659
exitstatus = EX_OSERR;
578
660
goto fallback;
579
661
}
580
662
custom_argv[0] = argv[0];
596
678
}
597
679
new_arg = strdup(p);
598
680
if(new_arg == NULL){
599
perror("strdup");
600
exitstatus = EXIT_FAILURE;
681
error(0, errno, "strdup");
682
exitstatus = EX_OSERR;
601
683
free(org_line);
602
684
goto fallback;
603
685
}
604
686
605
687
custom_argc += 1;
606
custom_argv = realloc(custom_argv, sizeof(char *)
607
* ((unsigned int) custom_argc + 1));
608
if(custom_argv == NULL){
609
perror("realloc");
610
exitstatus = EXIT_FAILURE;
611
free(org_line);
612
goto fallback;
688
{
689
char **new_argv = realloc(custom_argv, sizeof(char *)
690
* ((unsigned int)
691
custom_argc + 1));
692
if(new_argv == NULL){
693
error(0, errno, "realloc");
694
exitstatus = EX_OSERR;
695
free(new_arg);
696
free(org_line);
697
goto fallback;
698
} else {
699
custom_argv = new_argv;
700
}
613
701
}
614
702
custom_argv[custom_argc-1] = new_arg;
615
custom_argv[custom_argc] = NULL;
703
custom_argv[custom_argc] = NULL;
616
704
}
617
705
}
706
do {
707
ret = fclose(conffp);
708
} while(ret == EOF and errno == EINTR);
709
if(ret == EOF){
710
error(0, errno, "fclose");
711
exitstatus = EX_IOERR;
712
goto fallback;
713
}
618
714
free(org_line);
619
715
} else {
620
716
/* Check for harmful errors and go to fallback. Other errors might
621
717
not affect opening plugins */
622
718
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
623
perror("fopen");
624
exitstatus = EXIT_FAILURE;
719
error(0, errno, "fopen");
720
exitstatus = EX_OSERR;
625
721
goto fallback;
626
722
}
627
723
}
628
/* If there was any arguments from configuration file,
629
pass them to parser as command arguments */
724
/* If there were any arguments from the configuration file, pass
725
them to parser as command line arguments */
630
726
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;
727
ret = argp_parse(&argp, custom_argc, custom_argv,
728
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
729
NULL, NULL);
730
switch(ret){
731
case 0:
732
break;
733
case ENOMEM:
734
default:
735
errno = ret;
736
error(0, errno, "argp_parse");
737
exitstatus = EX_OSERR;
738
goto fallback;
739
case EINVAL:
740
exitstatus = EX_CONFIG;
636
741
goto fallback;
637
742
}
638
743
}
639
744
640
745
/* Parse actual command line arguments, to let them override the
641
746
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;
747
ret = argp_parse(&argp, argc, argv,
748
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
749
NULL, NULL);
750
switch(ret){
751
case 0:
752
break;
753
case ENOMEM:
754
default:
755
errno = ret;
756
error(0, errno, "argp_parse");
757
exitstatus = EX_OSERR;
758
goto fallback;
759
case EINVAL:
760
exitstatus = EX_USAGE;
646
761
goto fallback;
647
762
}
648
763
660
775
}
661
776
}
662
777
663
/* Strip permissions down to nobody */
664
setgid(gid);
778
if(getuid() == 0){
779
/* Work around Debian bug #633582:
780
<http://bugs.debian.org/633582> */
781
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
782
if(plugindir_fd == -1){
783
if(errno != ENOENT){
784
error(0, errno, "open(\"" PDIR "\")");
785
}
786
} else {
787
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
788
if(ret == -1){
789
error(0, errno, "fstat");
790
} else {
791
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
792
ret = fchown(plugindir_fd, uid, gid);
793
if(ret == -1){
794
error(0, errno, "fchown");
795
}
796
}
797
}
798
TEMP_FAILURE_RETRY(close(plugindir_fd));
799
}
800
}
801
802
/* Lower permissions */
803
ret = setgid(gid);
665
804
if(ret == -1){
666
perror("setgid");
805
error(0, errno, "setgid");
667
806
}
668
807
ret = setuid(uid);
669
808
if(ret == -1){
670
perror("setuid");
671
}
672
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 */
809
error(0, errno, "setuid");
810
}
811
812
/* Open plugin directory with close_on_exec flag */
686
813
{
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;
814
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
815
#ifdef O_CLOEXEC
816
O_CLOEXEC
817
#else /* not O_CLOEXEC */
818
0
819
#endif /* not O_CLOEXEC */
820
);
821
if(dir_fd == -1){
822
error(0, errno, "Could not open plugin dir");
823
exitstatus = EX_UNAVAILABLE;
824
goto fallback;
825
}
826
827
#ifndef O_CLOEXEC
828
/* Set the FD_CLOEXEC flag on the directory */
829
ret = set_cloexec_flag(dir_fd);
830
if(ret < 0){
831
error(0, errno, "set_cloexec_flag");
832
TEMP_FAILURE_RETRY(close(dir_fd));
833
exitstatus = EX_OSERR;
834
goto fallback;
835
}
836
#endif /* O_CLOEXEC */
837
}
838
839
int good_name(const struct dirent * const dirent){
840
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
841
"*.dpkg-old", "*.dpkg-bak",
842
"*.dpkg-divert", NULL };
843
#ifdef __GNUC__
844
#pragma GCC diagnostic push
845
#pragma GCC diagnostic ignored "-Wcast-qual"
846
#endif
847
for(const char **pat = (const char **)patterns;
848
*pat != NULL; pat++){
849
#ifdef __GNUC__
850
#pragma GCC diagnostic pop
851
#endif
852
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
853
!= FNM_NOMATCH){
854
if(debug){
855
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
856
" matching pattern %s\n", dirent->d_name, *pat);
857
}
858
return 0;
694
859
}
695
860
}
861
return 1;
862
}
863
864
#ifdef __GLIBC__
865
#if __GLIBC_PREREQ(2, 15)
866
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
867
alphasort);
868
#else /* not __GLIBC_PREREQ(2, 15) */
869
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
870
&direntries, good_name, alphasort);
871
#endif /* not __GLIBC_PREREQ(2, 15) */
872
#else /* not __GLIBC__ */
873
int numplugins = scandir(plugindir != NULL ? plugindir : PDIR,
874
&direntries, good_name, alphasort);
875
#endif /* not __GLIBC__ */
876
if(numplugins == -1){
877
error(0, errno, "Could not scan plugin dir");
878
TEMP_FAILURE_RETRY(close(dir_fd));
879
exitstatus = EX_OSERR;
880
goto fallback;
696
881
}
697
882
698
883
FD_ZERO(&rfds_all);
699
884
700
885
/* Read and execute any executable in the plugin directory*/
701
while(true){
702
dirst = readdir(dir);
703
704
/* All directory entries have been processed */
705
if(dirst == NULL){
706
if(errno == EBADF){
707
perror("readdir");
708
exitstatus = EXIT_FAILURE;
709
goto fallback;
710
}
711
break;
712
}
713
714
d_name_len = strlen(dirst->d_name);
715
716
/* Ignore dotfiles, backup files and other junk */
717
{
718
bool bad_name = false;
719
720
const char const *bad_prefixes[] = { ".", "#", NULL };
721
722
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
723
".dpkg-old",
724
".dpkg-bak",
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){
730
if(debug){
731
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
732
" with bad prefix %s\n", dirst->d_name, *pre);
733
}
734
bad_name = true;
735
break;
736
}
737
}
738
if(bad_name){
739
continue;
740
}
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)
745
== 0)){
746
if(debug){
747
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
748
" with bad suffix %s\n", dirst->d_name, *suf);
749
}
750
bad_name = true;
751
break;
752
}
753
}
754
755
if(bad_name){
756
continue;
757
}
758
}
759
760
char *filename;
761
if(plugindir == NULL){
762
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
763
} else {
764
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
765
}
766
if(ret < 0){
767
perror("asprintf");
886
for(int i = 0; i < numplugins; i++){
887
888
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
889
if(plugin_fd == -1){
890
error(0, errno, "Could not open plugin");
768
891
continue;
769
892
}
770
771
ret = stat(filename, &st);
893
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
772
894
if(ret == -1){
773
perror("stat");
774
free(filename);
895
error(0, errno, "stat");
896
TEMP_FAILURE_RETRY(close(plugin_fd));
775
897
continue;
776
898
}
777
899
778
900
/* Ignore non-executable files */
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
901
if(not S_ISREG(st.st_mode)
902
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
903
X_OK, 0)) != 0)){
780
904
if(debug){
781
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
782
" with bad type or mode\n", filename);
905
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
906
" with bad type or mode\n",
907
plugindir != NULL ? plugindir : PDIR,
908
direntries[i]->d_name);
783
909
}
784
free(filename);
910
TEMP_FAILURE_RETRY(close(plugin_fd));
785
911
continue;
786
912
}
787
913
788
plugin *p = getplugin(dirst->d_name);
914
plugin *p = getplugin(direntries[i]->d_name);
789
915
if(p == NULL){
790
perror("getplugin");
791
free(filename);
916
error(0, errno, "getplugin");
917
TEMP_FAILURE_RETRY(close(plugin_fd));
792
918
continue;
793
919
}
794
920
if(p->disabled){
795
921
if(debug){
796
922
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
797
dirst->d_name);
923
direntries[i]->d_name);
798
924
}
799
free(filename);
925
TEMP_FAILURE_RETRY(close(plugin_fd));
800
926
continue;
801
927
}
802
928
{
805
931
if(g != NULL){
806
932
for(char **a = g->argv + 1; *a != NULL; a++){
807
933
if(not add_argument(p, *a)){
808
perror("add_argument");
934
error(0, errno, "add_argument");
809
935
}
810
936
}
811
937
/* Add global environment variables */
812
938
for(char **e = g->environ; *e != NULL; e++){
813
939
if(not add_environment(p, *e, false)){
814
perror("add_environment");
940
error(0, errno, "add_environment");
815
941
}
816
942
}
817
943
}
818
944
}
819
/* If this plugin has any environment variables, we will call
820
using execve and need to duplicate the environment from this
821
process, too. */
945
/* If this plugin has any environment variables, we need to
946
duplicate the environment from this process, too. */
822
947
if(p->environ[0] != NULL){
823
948
for(char **e = environ; *e != NULL; e++){
824
949
if(not add_environment(p, *e, false)){
825
perror("add_environment");
950
error(0, errno, "add_environment");
826
951
}
827
952
}
828
953
}
829
954
830
955
int pipefd[2];
831
ret = pipe(pipefd);
956
#ifndef O_CLOEXEC
957
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
958
#else /* O_CLOEXEC */
959
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
960
#endif /* O_CLOEXEC */
832
961
if(ret == -1){
833
perror("pipe");
834
exitstatus = EXIT_FAILURE;
835
goto fallback;
836
}
962
error(0, errno, "pipe");
963
exitstatus = EX_OSERR;
964
goto fallback;
965
}
966
if(pipefd[0] >= FD_SETSIZE){
967
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
968
FD_SETSIZE);
969
TEMP_FAILURE_RETRY(close(pipefd[0]));
970
TEMP_FAILURE_RETRY(close(pipefd[1]));
971
exitstatus = EX_OSERR;
972
goto fallback;
973
}
974
#ifndef O_CLOEXEC
837
975
/* Ask OS to automatic close the pipe on exec */
838
976
ret = set_cloexec_flag(pipefd[0]);
839
977
if(ret < 0){
840
perror("set_cloexec_flag");
841
exitstatus = EXIT_FAILURE;
978
error(0, errno, "set_cloexec_flag");
979
TEMP_FAILURE_RETRY(close(pipefd[0]));
980
TEMP_FAILURE_RETRY(close(pipefd[1]));
981
exitstatus = EX_OSERR;
842
982
goto fallback;
843
983
}
844
984
ret = set_cloexec_flag(pipefd[1]);
845
985
if(ret < 0){
846
perror("set_cloexec_flag");
847
exitstatus = EXIT_FAILURE;
986
error(0, errno, "set_cloexec_flag");
987
TEMP_FAILURE_RETRY(close(pipefd[0]));
988
TEMP_FAILURE_RETRY(close(pipefd[1]));
989
exitstatus = EX_OSERR;
848
990
goto fallback;
849
991
}
992
#endif /* not O_CLOEXEC */
850
993
/* Block SIGCHLD until process is safely in process list */
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
994
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
995
&sigchld_action.sa_mask,
996
NULL));
852
997
if(ret < 0){
853
perror("sigprocmask");
854
exitstatus = EXIT_FAILURE;
998
error(0, errno, "sigprocmask");
999
exitstatus = EX_OSERR;
855
1000
goto fallback;
856
1001
}
857
1002
/* Starting a new process to be watched */
858
pid_t pid = fork();
1003
pid_t pid;
1004
do {
1005
pid = fork();
1006
} while(pid == -1 and errno == EINTR);
859
1007
if(pid == -1){
860
perror("fork");
861
exitstatus = EXIT_FAILURE;
1008
error(0, errno, "fork");
1009
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1010
&sigchld_action.sa_mask, NULL));
1011
TEMP_FAILURE_RETRY(close(pipefd[0]));
1012
TEMP_FAILURE_RETRY(close(pipefd[1]));
1013
exitstatus = EX_OSERR;
862
1014
goto fallback;
863
1015
}
864
1016
if(pid == 0){
865
1017
/* this is the child process */
866
1018
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
867
1019
if(ret < 0){
868
perror("sigaction");
869
_exit(EXIT_FAILURE);
1020
error(0, errno, "sigaction");
1021
_exit(EX_OSERR);
870
1022
}
871
1023
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
872
1024
if(ret < 0){
873
perror("sigprocmask");
874
_exit(EXIT_FAILURE);
1025
error(0, errno, "sigprocmask");
1026
_exit(EX_OSERR);
875
1027
}
876
1028
877
1029
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
878
1030
if(ret == -1){
879
perror("dup2");
880
_exit(EXIT_FAILURE);
1031
error(0, errno, "dup2");
1032
_exit(EX_OSERR);
881
1033
}
882
1034
883
if(dirfd(dir) < 0){
884
/* If dir has no file descriptor, we could not set FD_CLOEXEC
885
above and must now close it manually here. */
886
closedir(dir);
887
}
888
if(p->environ[0] == NULL){
889
if(execv(filename, p->argv) < 0){
890
perror("execv");
891
_exit(EXIT_FAILURE);
892
}
893
} else {
894
if(execve(filename, p->argv, p->environ) < 0){
895
perror("execve");
896
_exit(EXIT_FAILURE);
897
}
1035
if(fexecve(plugin_fd, p->argv,
1036
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1037
error(0, errno, "fexecve for %s/%s",
1038
plugindir != NULL ? plugindir : PDIR,
1039
direntries[i]->d_name);
1040
_exit(EX_OSERR);
898
1041
}
899
1042
/* no return */
900
1043
}
901
1044
/* Parent process */
902
close(pipefd[1]); /* Close unused write end of pipe */
903
free(filename);
904
plugin *new_plugin = getplugin(dirst->d_name);
1045
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1046
pipe */
1047
TEMP_FAILURE_RETRY(close(plugin_fd));
1048
plugin *new_plugin = getplugin(direntries[i]->d_name);
905
1049
if(new_plugin == NULL){
906
perror("getplugin");
907
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1050
error(0, errno, "getplugin");
1051
ret = (int)(TEMP_FAILURE_RETRY
1052
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1053
NULL)));
908
1054
if(ret < 0){
909
perror("sigprocmask");
1055
error(0, errno, "sigprocmask");
910
1056
}
911
exitstatus = EXIT_FAILURE;
1057
exitstatus = EX_OSERR;
912
1058
goto fallback;
913
1059
}
914
1060
917
1063
918
1064
/* Unblock SIGCHLD so signal handler can be run if this process
919
1065
has already completed */
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1066
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1067
&sigchld_action.sa_mask,
1068
NULL));
921
1069
if(ret < 0){
922
perror("sigprocmask");
923
exitstatus = EXIT_FAILURE;
1070
error(0, errno, "sigprocmask");
1071
exitstatus = EX_OSERR;
924
1072
goto fallback;
925
1073
}
926
1074
927
FD_SET(new_plugin->fd, &rfds_all);
1075
#if defined (__GNUC__) and defined (__GLIBC__)
1076
#if not __GLIBC_PREREQ(2, 16)
1077
#pragma GCC diagnostic push
1078
#pragma GCC diagnostic ignored "-Wsign-conversion"
1079
#endif
1080
#endif
1081
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1082
-Wconversion in GNU libc
1083
before 2.16 */
1084
#if defined (__GNUC__) and defined (__GLIBC__)
1085
#if not __GLIBC_PREREQ(2, 16)
1086
#pragma GCC diagnostic pop
1087
#endif
1088
#endif
928
1089
929
1090
if(maxfd < new_plugin->fd){
930
1091
maxfd = new_plugin->fd;
931
1092
}
932
1093
}
933
1094
934
closedir(dir);
935
dir = NULL;
1095
TEMP_FAILURE_RETRY(close(dir_fd));
936
1096
free_plugin(getplugin(NULL));
937
1097
938
1098
for(plugin *p = plugin_list; p != NULL; p = p->next){
950
1110
while(plugin_list){
951
1111
fd_set rfds = rfds_all;
952
1112
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
953
if(select_ret == -1){
954
perror("select");
955
exitstatus = EXIT_FAILURE;
1113
if(select_ret == -1 and errno != EINTR){
1114
error(0, errno, "select");
1115
exitstatus = EX_OSERR;
956
1116
goto fallback;
957
1117
}
958
1118
/* OK, now either a process completed, or something can be read
973
1133
WEXITSTATUS(proc->status));
974
1134
} else if(WIFSIGNALED(proc->status)){
975
1135
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
976
" signal %d\n", proc->name,
1136
" signal %d: %s\n", proc->name,
977
1137
(intmax_t) (proc->pid),
978
WTERMSIG(proc->status));
1138
WTERMSIG(proc->status),
1139
strsignal(WTERMSIG(proc->status)));
979
1140
} else if(WCOREDUMP(proc->status)){
980
1141
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
981
1142
" core\n", proc->name, (intmax_t) (proc->pid));
983
1144
}
984
1145
985
1146
/* Remove the plugin */
986
FD_CLR(proc->fd, &rfds_all);
1147
#if defined (__GNUC__) and defined (__GLIBC__)
1148
#if not __GLIBC_PREREQ(2, 16)
1149
#pragma GCC diagnostic push
1150
#pragma GCC diagnostic ignored "-Wsign-conversion"
1151
#endif
1152
#endif
1153
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1154
-Wconversion in GNU libc
1155
before 2.16 */
1156
#if defined (__GNUC__) and defined (__GLIBC__)
1157
#if not __GLIBC_PREREQ(2, 16)
1158
#pragma GCC diagnostic pop
1159
#endif
1160
#endif
987
1161
988
1162
/* Block signal while modifying process_list */
989
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1163
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1164
(SIG_BLOCK,
1165
&sigchld_action.sa_mask,
1166
NULL));
990
1167
if(ret < 0){
991
perror("sigprocmask");
992
exitstatus = EXIT_FAILURE;
1168
error(0, errno, "sigprocmask");
1169
exitstatus = EX_OSERR;
993
1170
goto fallback;
994
1171
}
995
1172
998
1175
proc = next_plugin;
999
1176
1000
1177
/* We are done modifying process list, so unblock signal */
1001
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1002
NULL);
1178
ret = (int)(TEMP_FAILURE_RETRY
1179
(sigprocmask(SIG_UNBLOCK,
1180
&sigchld_action.sa_mask, NULL)));
1003
1181
if(ret < 0){
1004
perror("sigprocmask");
1005
exitstatus = EXIT_FAILURE;
1182
error(0, errno, "sigprocmask");
1183
exitstatus = EX_OSERR;
1006
1184
goto fallback;
1007
1185
}
1008
1186
1018
1196
bool bret = print_out_password(proc->buffer,
1019
1197
proc->buffer_length);
1020
1198
if(not bret){
1021
perror("print_out_password");
1022
exitstatus = EXIT_FAILURE;
1199
error(0, errno, "print_out_password");
1200
exitstatus = EX_IOERR;
1023
1201
}
1024
1202
goto fallback;
1025
1203
}
1026
1204
1027
1205
/* This process has not completed. Does it have any output? */
1028
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1206
#if defined (__GNUC__) and defined (__GLIBC__)
1207
#if not __GLIBC_PREREQ(2, 16)
1208
#pragma GCC diagnostic push
1209
#pragma GCC diagnostic ignored "-Wsign-conversion"
1210
#endif
1211
#endif
1212
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1213
warning from
1214
-Wconversion
1215
in GNU libc
1216
before
1217
2.16 */
1218
#if defined (__GNUC__) and defined (__GLIBC__)
1219
#if not __GLIBC_PREREQ(2, 16)
1220
#pragma GCC diagnostic pop
1221
#endif
1222
#endif
1029
1223
/* This process had nothing to say at this time */
1030
1224
proc = proc->next;
1031
1225
continue;
1032
1226
}
1033
1227
/* Before reading, make the process' data buffer large enough */
1034
1228
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1035
proc->buffer = realloc(proc->buffer, proc->buffer_size
1036
+ (size_t) BUFFER_SIZE);
1037
if(proc->buffer == NULL){
1038
perror("malloc");
1039
exitstatus = EXIT_FAILURE;
1229
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1230
+ (size_t) BUFFER_SIZE);
1231
if(new_buffer == NULL){
1232
error(0, errno, "malloc");
1233
exitstatus = EX_OSERR;
1040
1234
goto fallback;
1041
1235
}
1236
proc->buffer = new_buffer;
1042
1237
proc->buffer_size += BUFFER_SIZE;
1043
1238
}
1044
1239
/* Read from the process */
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1046
BUFFER_SIZE);
1240
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1241
proc->buffer
1242
+ proc->buffer_length,
1243
BUFFER_SIZE));
1047
1244
if(sret < 0){
1048
1245
/* Read error from this process; ignore the error */
1049
1246
proc = proc->next;
1061
1258
1062
1259
fallback:
1063
1260
1064
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1261
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1262
and exitstatus != EX_OK)){
1065
1263
/* Fallback if all plugins failed, none are found or an error
1066
1264
occured */
1067
1265
bool bret;
1075
1273
}
1076
1274
bret = print_out_password(passwordbuffer, len);
1077
1275
if(not bret){
1078
perror("print_out_password");
1079
exitstatus = EXIT_FAILURE;
1276
error(0, errno, "print_out_password");
1277
exitstatus = EX_IOERR;
1080
1278
}
1081
1279
}
1082
1280
1083
1281
/* Restore old signal handler */
1084
1282
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1085
1283
if(ret == -1){
1086
perror("sigaction");
1087
exitstatus = EXIT_FAILURE;
1284
error(0, errno, "sigaction");
1285
exitstatus = EX_OSERR;
1088
1286
}
1089
1287
1090
1288
if(custom_argv != NULL){
1094
1292
free(custom_argv);
1095
1293
}
1096
1294
1097
if(dir != NULL){
1098
closedir(dir);
1295
if(dir_fd != -1){
1296
TEMP_FAILURE_RETRY(close(dir_fd));
1099
1297
}
1100
1298
1101
1299
/* Kill the processes */
1105
1303
ret = kill(p->pid, SIGTERM);
1106
1304
if(ret == -1 and errno != ESRCH){
1107
1305
/* Set-uid proccesses might not get closed */
1108
perror("kill");
1306
error(0, errno, "kill");
1109
1307
}
1110
1308
}
1111
1309
}
1112
1310
1113
1311
/* Wait for any remaining child processes to terminate */
1114
do{
1312
do {
1115
1313
ret = wait(NULL);
1116
1314
} while(ret >= 0);
1117
1315
if(errno != ECHILD){
1118
perror("wait");
1316
error(0, errno, "wait");
1119
1317
}
1120
1318
1121
1319
free_plugin_list();
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0