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.220
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.220
- Committer: Teddy Hogeborn
- Date: 2014-03-23 19:24:40 UTC
- mto: (237.7.272 trunk)
- mto: This revision was merged to the branch mainline in revision 311.
- Revision ID: teddy@recompile.se-20140323192440-d71iiqxebsxf9u2v
Update GCC warning flags and function attributes to GCC 4.7.
* Makefile (WARN): Update to include almost all warning flags.
* plugin-runner.c (getplugin, add_to_char_array, add_argument,
add_environment, set_cloexec_flag,
print_out_password): Add attribute
"warn_unused_result".
(main/parse_opt): Bug fix: Add error checking to --global-env,
--env-for, --plugin-dir, and --config-file, and
make sure errno does not "leak" from unrelated
functions.
* plugins.d/mandos-client.c
(fprintf_plus, debuggnutls, resolve_callback): Add "nonnull"
attribute.
(incbuffer, add_server, init_gpgme): Add "nonnull" and
"warn_unused_result"
attributes.
(pgp_packet_decrypt, init_gnutls_global): - '' -
(init_gnutls_session start_mandos_communication, get_flags): - '' -
(good_flags, good_interface, interface_is_up): - '' -
(interface_is_running, runnable_hook): - '' -
(avahi_loop_with_timeout, bring_up_interface): : - '' -
(safer_gnutls_strerror): Add "warn_unused_result" attribute.
(notdotentries): Set "nonnull", "pure", and "warn_unused_result"
attributes.
(raise_privileges, raise_privileges_permanently, lower_privileges,
lower_privileges_permanently): Set "warn_unused_result" attribute.
(run_network_hooks): Exit child process if it fails to do anything
it needs to do. Make explicit cast to double
when passing float value to asprintf(). Change
return type to void - all callers changed.
(bring_up_interface): Move variables "sd", "ret_errno", and
"ret_setflags" to innermost scope. Bug fix:
Fail if could not get interface flags also in
non-debug mode, and restore old errno
correctly. Print message if could not raise
(or later lower) privileges.
(take_down_interface): Bug fix: When failing because it could not
get interface flags, restore old errno
correctly. Print message if it could not
raise (or later lower) privileges.
(main): Complain if failed to raise or lower privileges. Only run
network hooks or lower privileges if raising privileges was
successful.
* Makefile (WARN): Update to include almost all warning flags.
* plugin-runner.c (getplugin, add_to_char_array, add_argument,
add_environment, set_cloexec_flag,
print_out_password): Add attribute
"warn_unused_result".
(main/parse_opt): Bug fix: Add error checking to --global-env,
--env-for, --plugin-dir, and --config-file, and
make sure errno does not "leak" from unrelated
functions.
* plugins.d/mandos-client.c
(fprintf_plus, debuggnutls, resolve_callback): Add "nonnull"
attribute.
(incbuffer, add_server, init_gpgme): Add "nonnull" and
"warn_unused_result"
attributes.
(pgp_packet_decrypt, init_gnutls_global): - '' -
(init_gnutls_session start_mandos_communication, get_flags): - '' -
(good_flags, good_interface, interface_is_up): - '' -
(interface_is_running, runnable_hook): - '' -
(avahi_loop_with_timeout, bring_up_interface): : - '' -
(safer_gnutls_strerror): Add "warn_unused_result" attribute.
(notdotentries): Set "nonnull", "pure", and "warn_unused_result"
attributes.
(raise_privileges, raise_privileges_permanently, lower_privileges,
lower_privileges_permanently): Set "warn_unused_result" attribute.
(run_network_hooks): Exit child process if it fails to do anything
it needs to do. Make explicit cast to double
when passing float value to asprintf(). Change
return type to void - all callers changed.
(bring_up_interface): Move variables "sd", "ret_errno", and
"ret_setflags" to innermost scope. Bug fix:
Fail if could not get interface flags also in
non-debug mode, and restore old errno
correctly. Print message if could not raise
(or later lower) privileges.
(take_down_interface): Bug fix: When failing because it could not
get interface flags, restore old errno
correctly. Print message if it could not
raise (or later lower) privileges.
(main): Complain if failed to raise or lower privileges. Only run
network hooks or lower privileges if raising privileges was
successful.
- files added:
- DBUS-API
- debian/source
- 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-2013 Teddy Hogeborn
6
* Copyright © 2008-2013 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
asprintf(), O_CLOEXEC */
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(),
31
#include <stdio.h> /* fileno(), fprintf(),
32
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, opendir(), stat(), struct
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
34
stat, waitpid(), WIFEXITED(),
35
35
WEXITSTATUS(), wait(), pid_t,
36
36
uid_t, gid_t, getuid(), getgid(),
38
38
#include <sys/select.h> /* fd_set, select(), FD_ZERO(),
39
39
FD_SET(), FD_ISSET(), FD_CLR */
40
40
#include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(),
41
WEXITSTATUS() */
41
WEXITSTATUS(), WTERMSIG(),
42
WCOREDUMP() */
42
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
43
44
#include <iso646.h> /* and, or, not */
44
#include <dirent.h> /* DIR, struct dirent, opendir(),
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
45
46
readdir(), closedir(), dirfd() */
46
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
47
48
fcntl(), setuid(), setgid(),
52
53
close() */
53
54
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
54
55
FD_CLOEXEC */
55
#include <string.h> /* strsep, strlen(), asprintf() */
56
#include <string.h> /* strsep, strlen(), asprintf(),
57
strsignal(), strcmp(), strncmp() */
56
58
#include <errno.h> /* errno */
57
59
#include <argp.h> /* struct argp_option, struct
58
60
argp_state, struct argp,
66
68
*/
67
69
#include <errno.h> /* errno, EBADF */
68
70
#include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */
71
#include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR,
72
EX_CONFIG, EX_UNAVAILABLE, EX_OK */
73
#include <errno.h> /* errno */
74
#include <error.h> /* error() */
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
}
208
243
/*
209
244
* Based on the example in the GNU LibC manual chapter 13.13 "File
210
245
* Descriptor Flags".
211
* *Note File Descriptor Flags:(libc)Descriptor Flags.
246
| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
212
247
*/
248
__attribute__((warn_unused_result))
213
249
static int set_cloexec_flag(int fd){
214
int ret = fcntl(fd, F_GETFD, 0);
250
int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
215
251
/* If reading the flags failed, return error indication now. */
216
252
if(ret < 0){
217
253
return ret;
218
254
}
219
255
/* Store modified flag word in the descriptor. */
220
return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);
256
return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
257
ret | FD_CLOEXEC));
221
258
}
222
259
223
260
238
275
/* No child processes */
239
276
break;
240
277
}
241
perror("waitpid");
278
error(0, errno, "waitpid");
242
279
}
243
280
244
281
/* A child exited, find it in process_list */
256
293
}
257
294
258
295
/* Prints out a password to stdout */
296
__attribute__((nonnull, warn_unused_result))
259
297
static bool print_out_password(const char *buffer, size_t length){
260
298
ssize_t ret;
261
299
for(size_t written = 0; written < length; written += (size_t)ret){
269
307
}
270
308
271
309
/* Removes and free a plugin from the plugin list */
310
__attribute__((nonnull))
272
311
static void free_plugin(plugin *plugin_node){
273
312
274
313
for(char **arg = plugin_node->argv; *arg != NULL; arg++){
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;
330
368
sigemptyset(&sigchld_action.sa_mask);
331
369
ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD);
332
370
if(ret == -1){
333
perror("sigaddset");
334
exitstatus = EXIT_FAILURE;
371
error(0, errno, "sigaddset");
372
exitstatus = EX_OSERR;
335
373
goto fallback;
336
374
}
337
375
ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action);
338
376
if(ret == -1){
339
perror("sigaction");
340
exitstatus = EXIT_FAILURE;
377
error(0, errno, "sigaction");
378
exitstatus = EX_OSERR;
341
379
goto fallback;
342
380
}
343
381
375
413
.doc = "Group ID the plugins will run as", .group = 3 },
376
414
{ .name = "debug", .key = 132,
377
415
.doc = "Debug mode", .group = 4 },
416
/*
417
* These reproduce what we would get without ARGP_NO_HELP
418
*/
419
{ .name = "help", .key = '?',
420
.doc = "Give this help list", .group = -1 },
421
{ .name = "usage", .key = -3,
422
.doc = "Give a short usage message", .group = -1 },
423
{ .name = "version", .key = 'V',
424
.doc = "Print program version", .group = -1 },
378
425
{ .name = NULL }
379
426
};
380
427
381
error_t parse_opt(int key, char *arg, __attribute__((unused))
382
struct argp_state *state){
383
char *tmp;
428
__attribute__((nonnull(3)))
429
error_t parse_opt(int key, char *arg, struct argp_state *state){
430
errno = 0;
384
431
switch(key){
432
char *tmp;
433
intmax_t tmp_id;
385
434
case 'g': /* --global-options */
386
if(arg != NULL){
435
{
387
436
char *plugin_option;
388
437
while((plugin_option = strsep(&arg, ",")) != NULL){
389
if(plugin_option[0] == '\0'){
390
continue;
391
}
392
438
if(not add_argument(getplugin(NULL), plugin_option)){
393
perror("add_argument");
394
return ARGP_ERR_UNKNOWN;
439
break;
395
440
}
396
441
}
442
errno = 0;
397
443
}
398
444
break;
399
445
case 'G': /* --global-env */
400
if(arg == NULL){
401
break;
402
}
403
if(not add_environment(getplugin(NULL), arg, true)){
404
perror("add_environment");
446
if(add_environment(getplugin(NULL), arg, true)){
447
errno = 0;
405
448
}
406
449
break;
407
450
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;
451
{
452
char *option_list = strchr(arg, ':');
453
if(option_list == NULL){
454
argp_error(state, "No colon in \"%s\"", arg);
455
errno = EINVAL;
456
break;
457
}
458
*option_list = '\0';
459
option_list++;
460
if(arg[0] == '\0'){
461
argp_error(state, "Empty plugin name");
462
errno = EINVAL;
463
break;
464
}
465
char *option;
466
while((option = strsep(&option_list, ",")) != NULL){
467
if(not add_argument(getplugin(arg), option)){
468
break;
418
469
}
419
470
}
471
errno = 0;
420
472
}
421
473
break;
422
474
case 'E': /* --env-for */
423
if(arg == NULL){
424
break;
425
}
426
475
{
427
476
char *envdef = strchr(arg, ':');
428
477
if(envdef == NULL){
478
argp_error(state, "No colon in \"%s\"", arg);
479
errno = EINVAL;
429
480
break;
430
481
}
431
482
*envdef = '\0';
432
if(not add_environment(getplugin(arg), envdef+1, true)){
433
perror("add_environment");
483
envdef++;
484
if(arg[0] == '\0'){
485
argp_error(state, "Empty plugin name");
486
errno = EINVAL;
487
break;
488
}
489
if(add_environment(getplugin(arg), envdef, true)){
490
errno = 0;
434
491
}
435
492
}
436
493
break;
437
494
case 'd': /* --disable */
438
if(arg != NULL){
495
{
439
496
plugin *p = getplugin(arg);
440
if(p == NULL){
441
return ARGP_ERR_UNKNOWN;
497
if(p != NULL){
498
p->disabled = true;
499
errno = 0;
442
500
}
443
p->disabled = true;
444
501
}
445
502
break;
446
503
case 'e': /* --enable */
447
if(arg != NULL){
504
{
448
505
plugin *p = getplugin(arg);
449
if(p == NULL){
450
return ARGP_ERR_UNKNOWN;
506
if(p != NULL){
507
p->disabled = false;
508
errno = 0;
451
509
}
452
p->disabled = false;
453
510
}
454
511
break;
455
512
case 128: /* --plugin-dir */
456
513
free(plugindir);
457
514
plugindir = strdup(arg);
458
if(plugindir == NULL){
459
perror("strdup");
460
}
515
if(plugindir != NULL){
516
errno = 0;
517
}
461
518
break;
462
519
case 129: /* --config-file */
463
520
/* This is already done by parse_opt_config_file() */
464
521
break;
465
522
case 130: /* --userid */
466
errno = 0;
467
tmpmax = strtoimax(arg, &tmp, 10);
523
tmp_id = strtoimax(arg, &tmp, 10);
468
524
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;
525
or tmp_id != (uid_t)tmp_id){
526
argp_error(state, "Bad user ID number: \"%s\", using %"
527
PRIdMAX, arg, (intmax_t)uid);
528
break;
474
529
}
530
uid = (uid_t)tmp_id;
531
errno = 0;
475
532
break;
476
533
case 131: /* --groupid */
477
errno = 0;
478
tmpmax = strtoimax(arg, &tmp, 10);
534
tmp_id = strtoimax(arg, &tmp, 10);
479
535
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;
536
or tmp_id != (gid_t)tmp_id){
537
argp_error(state, "Bad group ID number: \"%s\", using %"
538
PRIdMAX, arg, (intmax_t)gid);
539
break;
485
540
}
541
gid = (gid_t)tmp_id;
542
errno = 0;
486
543
break;
487
544
case 132: /* --debug */
488
545
debug = true;
489
546
break;
547
/*
548
* These reproduce what we would get without ARGP_NO_HELP
549
*/
550
case '?': /* --help */
551
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
552
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
553
case -3: /* --usage */
554
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
555
argp_state_help(state, state->out_stream,
556
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
557
case 'V': /* --version */
558
fprintf(state->out_stream, "%s\n", argp_program_version);
559
exit(EXIT_SUCCESS);
560
break;
490
561
/*
491
562
* When adding more options before this line, remember to also add a
492
563
* "case" to the "parse_opt_config_file" function below.
495
566
/* Cryptsetup always passes an argument, which is an empty
496
567
string if "none" was specified in /etc/crypttab. So if
497
568
argument was empty, we ignore it silently. */
498
if(arg[0] != '\0'){
499
fprintf(stderr, "Ignoring unknown argument \"%s\"\n", arg);
569
if(arg[0] == '\0'){
570
break;
500
571
}
501
break;
502
case ARGP_KEY_END:
503
break;
504
572
default:
505
573
return ARGP_ERR_UNKNOWN;
506
574
}
507
return 0;
575
return errno; /* Set to 0 at start */
508
576
}
509
577
510
578
/* This option parser is the same as parse_opt() above, except it
512
580
error_t parse_opt_config_file(int key, char *arg,
513
581
__attribute__((unused))
514
582
struct argp_state *state){
583
errno = 0;
515
584
switch(key){
516
585
case 'g': /* --global-options */
517
586
case 'G': /* --global-env */
524
593
case 129: /* --config-file */
525
594
free(argfile);
526
595
argfile = strdup(arg);
527
if(argfile == NULL){
528
perror("strdup");
596
if(argfile != NULL){
597
errno = 0;
529
598
}
530
break;
599
break;
531
600
case 130: /* --userid */
532
601
case 131: /* --groupid */
533
602
case 132: /* --debug */
603
case '?': /* --help */
604
case -3: /* --usage */
605
case 'V': /* --version */
534
606
case ARGP_KEY_ARG:
535
case ARGP_KEY_END:
536
607
break;
537
608
default:
538
609
return ARGP_ERR_UNKNOWN;
539
610
}
540
return 0;
611
return errno;
541
612
}
542
613
543
614
struct argp argp = { .options = options,
547
618
548
619
/* Parse using parse_opt_config_file() in order to get the custom
549
620
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;
621
ret = argp_parse(&argp, argc, argv,
622
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
623
NULL, NULL);
624
switch(ret){
625
case 0:
626
break;
627
case ENOMEM:
628
default:
629
errno = ret;
630
error(0, errno, "argp_parse");
631
exitstatus = EX_OSERR;
632
goto fallback;
633
case EINVAL:
634
exitstatus = EX_USAGE;
554
635
goto fallback;
555
636
}
556
637
562
643
conffp = fopen(AFILE, "r");
563
644
} else {
564
645
conffp = fopen(argfile, "r");
565
}
646
}
566
647
if(conffp != NULL){
567
648
char *org_line = NULL;
568
649
char *p, *arg, *new_arg, *line;
573
654
custom_argc = 1;
574
655
custom_argv = malloc(sizeof(char*) * 2);
575
656
if(custom_argv == NULL){
576
perror("malloc");
577
exitstatus = EXIT_FAILURE;
657
error(0, errno, "malloc");
658
exitstatus = EX_OSERR;
578
659
goto fallback;
579
660
}
580
661
custom_argv[0] = argv[0];
596
677
}
597
678
new_arg = strdup(p);
598
679
if(new_arg == NULL){
599
perror("strdup");
600
exitstatus = EXIT_FAILURE;
680
error(0, errno, "strdup");
681
exitstatus = EX_OSERR;
601
682
free(org_line);
602
683
goto fallback;
603
684
}
604
685
605
686
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;
687
{
688
char **new_argv = realloc(custom_argv, sizeof(char *)
689
* ((unsigned int)
690
custom_argc + 1));
691
if(new_argv == NULL){
692
error(0, errno, "realloc");
693
exitstatus = EX_OSERR;
694
free(new_arg);
695
free(org_line);
696
goto fallback;
697
} else {
698
custom_argv = new_argv;
699
}
613
700
}
614
701
custom_argv[custom_argc-1] = new_arg;
615
custom_argv[custom_argc] = NULL;
702
custom_argv[custom_argc] = NULL;
616
703
}
617
704
}
705
do {
706
ret = fclose(conffp);
707
} while(ret == EOF and errno == EINTR);
708
if(ret == EOF){
709
error(0, errno, "fclose");
710
exitstatus = EX_IOERR;
711
goto fallback;
712
}
618
713
free(org_line);
619
714
} else {
620
715
/* Check for harmful errors and go to fallback. Other errors might
621
716
not affect opening plugins */
622
717
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
623
perror("fopen");
624
exitstatus = EXIT_FAILURE;
718
error(0, errno, "fopen");
719
exitstatus = EX_OSERR;
625
720
goto fallback;
626
721
}
627
722
}
628
/* If there was any arguments from configuration file,
629
pass them to parser as command arguments */
723
/* If there were any arguments from the configuration file, pass
724
them to parser as command line arguments */
630
725
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;
726
ret = argp_parse(&argp, custom_argc, custom_argv,
727
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
728
NULL, NULL);
729
switch(ret){
730
case 0:
731
break;
732
case ENOMEM:
733
default:
734
errno = ret;
735
error(0, errno, "argp_parse");
736
exitstatus = EX_OSERR;
737
goto fallback;
738
case EINVAL:
739
exitstatus = EX_CONFIG;
636
740
goto fallback;
637
741
}
638
742
}
639
743
640
744
/* Parse actual command line arguments, to let them override the
641
745
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;
746
ret = argp_parse(&argp, argc, argv,
747
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
748
NULL, NULL);
749
switch(ret){
750
case 0:
751
break;
752
case ENOMEM:
753
default:
754
errno = ret;
755
error(0, errno, "argp_parse");
756
exitstatus = EX_OSERR;
757
goto fallback;
758
case EINVAL:
759
exitstatus = EX_USAGE;
646
760
goto fallback;
647
761
}
648
762
660
774
}
661
775
}
662
776
663
/* Strip permissions down to nobody */
664
setgid(gid);
777
if(getuid() == 0){
778
/* Work around Debian bug #633582:
779
<http://bugs.debian.org/633582> */
780
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
781
if(plugindir_fd == -1){
782
error(0, errno, "open");
783
} else {
784
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
785
if(ret == -1){
786
error(0, errno, "fstat");
787
} else {
788
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
789
ret = fchown(plugindir_fd, uid, gid);
790
if(ret == -1){
791
error(0, errno, "fchown");
792
}
793
}
794
}
795
TEMP_FAILURE_RETRY(close(plugindir_fd));
796
}
797
}
798
799
/* Lower permissions */
800
ret = setgid(gid);
665
801
if(ret == -1){
666
perror("setgid");
802
error(0, errno, "setgid");
667
803
}
668
804
ret = setuid(uid);
669
805
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 */
806
error(0, errno, "setuid");
807
}
808
809
/* Open plugin directory with close_on_exec flag */
686
810
{
687
int dir_fd = dirfd(dir);
688
if(dir_fd >= 0){
689
ret = set_cloexec_flag(dir_fd);
690
if(ret < 0){
691
perror("set_cloexec_flag");
692
exitstatus = EXIT_FAILURE;
693
goto fallback;
694
}
811
int dir_fd = -1;
812
if(plugindir == NULL){
813
dir_fd = open(PDIR, O_RDONLY |
814
#ifdef O_CLOEXEC
815
O_CLOEXEC
816
#else /* not O_CLOEXEC */
817
0
818
#endif /* not O_CLOEXEC */
819
);
820
} else {
821
dir_fd = open(plugindir, O_RDONLY |
822
#ifdef O_CLOEXEC
823
O_CLOEXEC
824
#else /* not O_CLOEXEC */
825
0
826
#endif /* not O_CLOEXEC */
827
);
828
}
829
if(dir_fd == -1){
830
error(0, errno, "Could not open plugin dir");
831
exitstatus = EX_UNAVAILABLE;
832
goto fallback;
833
}
834
835
#ifndef O_CLOEXEC
836
/* Set the FD_CLOEXEC flag on the directory */
837
ret = set_cloexec_flag(dir_fd);
838
if(ret < 0){
839
error(0, errno, "set_cloexec_flag");
840
TEMP_FAILURE_RETRY(close(dir_fd));
841
exitstatus = EX_OSERR;
842
goto fallback;
843
}
844
#endif /* O_CLOEXEC */
845
846
dir = fdopendir(dir_fd);
847
if(dir == NULL){
848
error(0, errno, "Could not open plugin dir");
849
TEMP_FAILURE_RETRY(close(dir_fd));
850
exitstatus = EX_OSERR;
851
goto fallback;
695
852
}
696
853
}
697
854
699
856
700
857
/* Read and execute any executable in the plugin directory*/
701
858
while(true){
702
dirst = readdir(dir);
859
do {
860
dirst = readdir(dir);
861
} while(dirst == NULL and errno == EINTR);
703
862
704
863
/* All directory entries have been processed */
705
864
if(dirst == NULL){
706
865
if(errno == EBADF){
707
perror("readdir");
708
exitstatus = EXIT_FAILURE;
866
error(0, errno, "readdir");
867
exitstatus = EX_IOERR;
709
868
goto fallback;
710
869
}
711
870
break;
717
876
{
718
877
bool bad_name = false;
719
878
720
const char const *bad_prefixes[] = { ".", "#", NULL };
879
const char * const bad_prefixes[] = { ".", "#", NULL };
721
880
722
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
881
const char * const bad_suffixes[] = { "~", "#", ".dpkg-new",
723
882
".dpkg-old",
724
883
".dpkg-bak",
725
884
".dpkg-divert", NULL };
726
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
885
#ifdef __GNUC__
886
#pragma GCC diagnostic push
887
#pragma GCC diagnostic ignored "-Wcast-qual"
888
#endif
889
for(const char **pre = (const char **)bad_prefixes;
890
*pre != NULL; pre++){
891
#ifdef __GNUC__
892
#pragma GCC diagnostic pop
893
#endif
727
894
size_t pre_len = strlen(*pre);
728
895
if((d_name_len >= pre_len)
729
896
and strncmp((dirst->d_name), *pre, pre_len) == 0){
738
905
if(bad_name){
739
906
continue;
740
907
}
741
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
908
#ifdef __GNUC__
909
#pragma GCC diagnostic push
910
#pragma GCC diagnostic ignored "-Wcast-qual"
911
#endif
912
for(const char **suf = (const char **)bad_suffixes;
913
*suf != NULL; suf++){
914
#ifdef __GNUC__
915
#pragma GCC diagnostic pop
916
#endif
742
917
size_t suf_len = strlen(*suf);
743
918
if((d_name_len >= suf_len)
744
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
919
and (strcmp((dirst->d_name) + d_name_len-suf_len, *suf)
745
920
== 0)){
746
921
if(debug){
747
922
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
759
934
760
935
char *filename;
761
936
if(plugindir == NULL){
762
ret = asprintf(&filename, PDIR "/%s", dirst->d_name);
937
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
938
dirst->d_name));
763
939
} else {
764
ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);
940
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
941
plugindir,
942
dirst->d_name));
765
943
}
766
944
if(ret < 0){
767
perror("asprintf");
945
error(0, errno, "asprintf");
768
946
continue;
769
947
}
770
948
771
ret = stat(filename, &st);
949
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
772
950
if(ret == -1){
773
perror("stat");
951
error(0, errno, "stat");
774
952
free(filename);
775
953
continue;
776
954
}
777
955
778
956
/* Ignore non-executable files */
779
if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){
957
if(not S_ISREG(st.st_mode)
958
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
780
959
if(debug){
781
960
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
782
961
" with bad type or mode\n", filename);
787
966
788
967
plugin *p = getplugin(dirst->d_name);
789
968
if(p == NULL){
790
perror("getplugin");
969
error(0, errno, "getplugin");
791
970
free(filename);
792
971
continue;
793
972
}
805
984
if(g != NULL){
806
985
for(char **a = g->argv + 1; *a != NULL; a++){
807
986
if(not add_argument(p, *a)){
808
perror("add_argument");
987
error(0, errno, "add_argument");
809
988
}
810
989
}
811
990
/* Add global environment variables */
812
991
for(char **e = g->environ; *e != NULL; e++){
813
992
if(not add_environment(p, *e, false)){
814
perror("add_environment");
993
error(0, errno, "add_environment");
815
994
}
816
995
}
817
996
}
822
1001
if(p->environ[0] != NULL){
823
1002
for(char **e = environ; *e != NULL; e++){
824
1003
if(not add_environment(p, *e, false)){
825
perror("add_environment");
1004
error(0, errno, "add_environment");
826
1005
}
827
1006
}
828
1007
}
829
1008
830
1009
int pipefd[2];
831
ret = pipe(pipefd);
1010
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
832
1011
if(ret == -1){
833
perror("pipe");
834
exitstatus = EXIT_FAILURE;
1012
error(0, errno, "pipe");
1013
exitstatus = EX_OSERR;
835
1014
goto fallback;
836
1015
}
837
1016
/* Ask OS to automatic close the pipe on exec */
838
1017
ret = set_cloexec_flag(pipefd[0]);
839
1018
if(ret < 0){
840
perror("set_cloexec_flag");
841
exitstatus = EXIT_FAILURE;
1019
error(0, errno, "set_cloexec_flag");
1020
exitstatus = EX_OSERR;
842
1021
goto fallback;
843
1022
}
844
1023
ret = set_cloexec_flag(pipefd[1]);
845
1024
if(ret < 0){
846
perror("set_cloexec_flag");
847
exitstatus = EXIT_FAILURE;
1025
error(0, errno, "set_cloexec_flag");
1026
exitstatus = EX_OSERR;
848
1027
goto fallback;
849
1028
}
850
1029
/* Block SIGCHLD until process is safely in process list */
851
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1030
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
1031
&sigchld_action.sa_mask,
1032
NULL));
852
1033
if(ret < 0){
853
perror("sigprocmask");
854
exitstatus = EXIT_FAILURE;
1034
error(0, errno, "sigprocmask");
1035
exitstatus = EX_OSERR;
855
1036
goto fallback;
856
1037
}
857
1038
/* Starting a new process to be watched */
858
pid_t pid = fork();
1039
pid_t pid;
1040
do {
1041
pid = fork();
1042
} while(pid == -1 and errno == EINTR);
859
1043
if(pid == -1){
860
perror("fork");
861
exitstatus = EXIT_FAILURE;
1044
error(0, errno, "fork");
1045
exitstatus = EX_OSERR;
862
1046
goto fallback;
863
1047
}
864
1048
if(pid == 0){
865
1049
/* this is the child process */
866
1050
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
867
1051
if(ret < 0){
868
perror("sigaction");
869
_exit(EXIT_FAILURE);
1052
error(0, errno, "sigaction");
1053
_exit(EX_OSERR);
870
1054
}
871
1055
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
872
1056
if(ret < 0){
873
perror("sigprocmask");
874
_exit(EXIT_FAILURE);
1057
error(0, errno, "sigprocmask");
1058
_exit(EX_OSERR);
875
1059
}
876
1060
877
1061
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
878
1062
if(ret == -1){
879
perror("dup2");
880
_exit(EXIT_FAILURE);
1063
error(0, errno, "dup2");
1064
_exit(EX_OSERR);
881
1065
}
882
1066
883
1067
if(dirfd(dir) < 0){
887
1071
}
888
1072
if(p->environ[0] == NULL){
889
1073
if(execv(filename, p->argv) < 0){
890
perror("execv");
891
_exit(EXIT_FAILURE);
1074
error(0, errno, "execv for %s", filename);
1075
_exit(EX_OSERR);
892
1076
}
893
1077
} else {
894
1078
if(execve(filename, p->argv, p->environ) < 0){
895
perror("execve");
896
_exit(EXIT_FAILURE);
1079
error(0, errno, "execve for %s", filename);
1080
_exit(EX_OSERR);
897
1081
}
898
1082
}
899
1083
/* no return */
900
1084
}
901
1085
/* Parent process */
902
close(pipefd[1]); /* Close unused write end of pipe */
1086
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
1087
pipe */
903
1088
free(filename);
904
1089
plugin *new_plugin = getplugin(dirst->d_name);
905
1090
if(new_plugin == NULL){
906
perror("getplugin");
907
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1091
error(0, errno, "getplugin");
1092
ret = (int)(TEMP_FAILURE_RETRY
1093
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1094
NULL)));
908
1095
if(ret < 0){
909
perror("sigprocmask");
1096
error(0, errno, "sigprocmask");
910
1097
}
911
exitstatus = EXIT_FAILURE;
1098
exitstatus = EX_OSERR;
912
1099
goto fallback;
913
1100
}
914
1101
917
1104
918
1105
/* Unblock SIGCHLD so signal handler can be run if this process
919
1106
has already completed */
920
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
1107
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1108
&sigchld_action.sa_mask,
1109
NULL));
921
1110
if(ret < 0){
922
perror("sigprocmask");
923
exitstatus = EXIT_FAILURE;
1111
error(0, errno, "sigprocmask");
1112
exitstatus = EX_OSERR;
924
1113
goto fallback;
925
1114
}
926
1115
927
FD_SET(new_plugin->fd, &rfds_all);
1116
#if defined (__GNUC__) and defined (__GLIBC__)
1117
#if not __GLIBC_PREREQ(2, 16)
1118
#pragma GCC diagnostic push
1119
#pragma GCC diagnostic ignored "-Wsign-conversion"
1120
#endif
1121
#endif
1122
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1123
-Wconversion in GNU libc
1124
before 2.16 */
1125
#if defined (__GNUC__) and defined (__GLIBC__)
1126
#if not __GLIBC_PREREQ(2, 16)
1127
#pragma GCC diagnostic pop
1128
#endif
1129
#endif
928
1130
929
1131
if(maxfd < new_plugin->fd){
930
1132
maxfd = new_plugin->fd;
931
1133
}
932
1134
}
933
1135
934
closedir(dir);
1136
TEMP_FAILURE_RETRY(closedir(dir));
935
1137
dir = NULL;
936
1138
free_plugin(getplugin(NULL));
937
1139
950
1152
while(plugin_list){
951
1153
fd_set rfds = rfds_all;
952
1154
int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);
953
if(select_ret == -1){
954
perror("select");
955
exitstatus = EXIT_FAILURE;
1155
if(select_ret == -1 and errno != EINTR){
1156
error(0, errno, "select");
1157
exitstatus = EX_OSERR;
956
1158
goto fallback;
957
1159
}
958
1160
/* OK, now either a process completed, or something can be read
973
1175
WEXITSTATUS(proc->status));
974
1176
} else if(WIFSIGNALED(proc->status)){
975
1177
fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by"
976
" signal %d\n", proc->name,
1178
" signal %d: %s\n", proc->name,
977
1179
(intmax_t) (proc->pid),
978
WTERMSIG(proc->status));
1180
WTERMSIG(proc->status),
1181
strsignal(WTERMSIG(proc->status)));
979
1182
} else if(WCOREDUMP(proc->status)){
980
1183
fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
981
1184
" core\n", proc->name, (intmax_t) (proc->pid));
983
1186
}
984
1187
985
1188
/* Remove the plugin */
986
FD_CLR(proc->fd, &rfds_all);
1189
#if defined (__GNUC__) and defined (__GLIBC__)
1190
#if not __GLIBC_PREREQ(2, 16)
1191
#pragma GCC diagnostic push
1192
#pragma GCC diagnostic ignored "-Wsign-conversion"
1193
#endif
1194
#endif
1195
FD_CLR(proc->fd, &rfds_all); /* Spurious warning from
1196
-Wconversion in GNU libc
1197
before 2.16 */
1198
#if defined (__GNUC__) and defined (__GLIBC__)
1199
#if not __GLIBC_PREREQ(2, 16)
1200
#pragma GCC diagnostic pop
1201
#endif
1202
#endif
987
1203
988
1204
/* Block signal while modifying process_list */
989
ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);
1205
ret = (int)TEMP_FAILURE_RETRY(sigprocmask
1206
(SIG_BLOCK,
1207
&sigchld_action.sa_mask,
1208
NULL));
990
1209
if(ret < 0){
991
perror("sigprocmask");
992
exitstatus = EXIT_FAILURE;
1210
error(0, errno, "sigprocmask");
1211
exitstatus = EX_OSERR;
993
1212
goto fallback;
994
1213
}
995
1214
998
1217
proc = next_plugin;
999
1218
1000
1219
/* We are done modifying process list, so unblock signal */
1001
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
1002
NULL);
1220
ret = (int)(TEMP_FAILURE_RETRY
1221
(sigprocmask(SIG_UNBLOCK,
1222
&sigchld_action.sa_mask, NULL)));
1003
1223
if(ret < 0){
1004
perror("sigprocmask");
1005
exitstatus = EXIT_FAILURE;
1224
error(0, errno, "sigprocmask");
1225
exitstatus = EX_OSERR;
1006
1226
goto fallback;
1007
1227
}
1008
1228
1018
1238
bool bret = print_out_password(proc->buffer,
1019
1239
proc->buffer_length);
1020
1240
if(not bret){
1021
perror("print_out_password");
1022
exitstatus = EXIT_FAILURE;
1241
error(0, errno, "print_out_password");
1242
exitstatus = EX_IOERR;
1023
1243
}
1024
1244
goto fallback;
1025
1245
}
1026
1246
1027
1247
/* This process has not completed. Does it have any output? */
1028
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1248
#if defined (__GNUC__) and defined (__GLIBC__)
1249
#if not __GLIBC_PREREQ(2, 16)
1250
#pragma GCC diagnostic push
1251
#pragma GCC diagnostic ignored "-Wsign-conversion"
1252
#endif
1253
#endif
1254
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1255
warning from
1256
-Wconversion
1257
in GNU libc
1258
before
1259
2.16 */
1260
#if defined (__GNUC__) and defined (__GLIBC__)
1261
#if not __GLIBC_PREREQ(2, 16)
1262
#pragma GCC diagnostic pop
1263
#endif
1264
#endif
1029
1265
/* This process had nothing to say at this time */
1030
1266
proc = proc->next;
1031
1267
continue;
1032
1268
}
1033
1269
/* Before reading, make the process' data buffer large enough */
1034
1270
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;
1271
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1272
+ (size_t) BUFFER_SIZE);
1273
if(new_buffer == NULL){
1274
error(0, errno, "malloc");
1275
exitstatus = EX_OSERR;
1040
1276
goto fallback;
1041
1277
}
1278
proc->buffer = new_buffer;
1042
1279
proc->buffer_size += BUFFER_SIZE;
1043
1280
}
1044
1281
/* Read from the process */
1045
sret = read(proc->fd, proc->buffer + proc->buffer_length,
1046
BUFFER_SIZE);
1282
sret = TEMP_FAILURE_RETRY(read(proc->fd,
1283
proc->buffer
1284
+ proc->buffer_length,
1285
BUFFER_SIZE));
1047
1286
if(sret < 0){
1048
1287
/* Read error from this process; ignore the error */
1049
1288
proc = proc->next;
1061
1300
1062
1301
fallback:
1063
1302
1064
if(plugin_list == NULL or exitstatus != EXIT_SUCCESS){
1303
if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS
1304
and exitstatus != EX_OK)){
1065
1305
/* Fallback if all plugins failed, none are found or an error
1066
1306
occured */
1067
1307
bool bret;
1075
1315
}
1076
1316
bret = print_out_password(passwordbuffer, len);
1077
1317
if(not bret){
1078
perror("print_out_password");
1079
exitstatus = EXIT_FAILURE;
1318
error(0, errno, "print_out_password");
1319
exitstatus = EX_IOERR;
1080
1320
}
1081
1321
}
1082
1322
1083
1323
/* Restore old signal handler */
1084
1324
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1085
1325
if(ret == -1){
1086
perror("sigaction");
1087
exitstatus = EXIT_FAILURE;
1326
error(0, errno, "sigaction");
1327
exitstatus = EX_OSERR;
1088
1328
}
1089
1329
1090
1330
if(custom_argv != NULL){
1105
1345
ret = kill(p->pid, SIGTERM);
1106
1346
if(ret == -1 and errno != ESRCH){
1107
1347
/* Set-uid proccesses might not get closed */
1108
perror("kill");
1348
error(0, errno, "kill");
1109
1349
}
1110
1350
}
1111
1351
}
1112
1352
1113
1353
/* Wait for any remaining child processes to terminate */
1114
do{
1354
do {
1115
1355
ret = wait(NULL);
1116
1356
} while(ret >= 0);
1117
1357
if(errno != ECHILD){
1118
perror("wait");
1358
error(0, errno, "wait");
1119
1359
}
1120
1360
1121
1361
free_plugin_list();
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0