3
3
* Mandos plugin runner - Run Mandos plugins
5
* Copyright © 2008,2009 Teddy Hogeborn
6
* Copyright © 2008,2009 Björn Påhlsson
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.
13
* This program is distributed in the hope that it will be useful, but
5
* Copyright © 2008-2020 Teddy Hogeborn
6
* Copyright © 2008-2020 Björn Påhlsson
8
* This file is part of Mandos.
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.
15
* Mandos is distributed in the hope that it will be useful, but
14
16
* WITHOUT ANY WARRANTY; without even the implied warranty of
15
17
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16
18
* General Public License for more details.
18
20
* You should have received a copy of the GNU General Public License
19
* along with this program. If not, see
20
* <http://www.gnu.org/licenses/>.
21
* along with Mandos. If not, see <http://www.gnu.org/licenses/>.
22
* Contact the authors at <mandos@fukt.bsnet.se>.
23
* Contact the authors at <mandos@recompile.se>.
25
26
#define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(),
26
asprintf(), O_CLOEXEC */
27
28
#include <stddef.h> /* size_t, NULL */
28
#include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE,
29
EXIT_SUCCESS, realloc() */
29
#include <stdlib.h> /* malloc(), reallocarray(), realloc(),
30
EXIT_SUCCESS, exit() */
30
31
#include <stdbool.h> /* bool, true, false */
31
#include <stdio.h> /* perror, fileno(), fprintf(),
32
stderr, STDOUT_FILENO */
33
#include <sys/types.h> /* DIR, fdopendir(), stat(), struct
34
stat, waitpid(), WIFEXITED(),
35
WEXITSTATUS(), wait(), pid_t,
36
uid_t, gid_t, getuid(), getgid(),
32
#include <stdio.h> /* fileno(), fprintf(),
33
stderr, STDOUT_FILENO, fclose() */
34
#include <sys/types.h> /* fstat(), struct stat, waitpid(),
35
WIFEXITED(), WEXITSTATUS(), wait(),
36
pid_t, uid_t, gid_t, getuid(),
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(), WTERMSIG(),
43
#include <sys/stat.h> /* struct stat, stat(), S_ISREG() */
41
WEXITSTATUS(), WTERMSIG() */
42
#include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */
44
43
#include <iso646.h> /* and, or, not */
45
#include <dirent.h> /* DIR, struct dirent, fdopendir(),
46
readdir(), closedir(), dirfd() */
47
#include <unistd.h> /* struct stat, stat(), S_ISREG(),
48
fcntl(), setuid(), setgid(),
49
F_GETFD, F_SETFD, FD_CLOEXEC,
50
access(), pipe(), fork(), close()
51
dup2(), STDOUT_FILENO, _exit(),
52
execv(), write(), read(),
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()
54
52
#include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD,
56
#include <string.h> /* strsep, strlen(), asprintf(),
53
FD_CLOEXEC, openat(), scandirat(),
55
#include <string.h> /* strsep, strlen(), strsignal(),
56
strcmp(), strncmp() */
58
57
#include <errno.h> /* errno */
59
58
#include <argp.h> /* struct argp_option, struct
60
59
argp_state, struct argp,
394
428
.doc = "Group ID the plugins will run as", .group = 3 },
395
429
{ .name = "debug", .key = 132,
396
430
.doc = "Debug mode", .group = 4 },
431
{ .name = "plugin-helper-dir", .key = 133,
433
.doc = "Specify a different plugin helper directory",
436
* These reproduce what we would get without ARGP_NO_HELP
438
{ .name = "help", .key = '?',
439
.doc = "Give this help list", .group = -1 },
440
{ .name = "usage", .key = -3,
441
.doc = "Give a short usage message", .group = -1 },
442
{ .name = "version", .key = 'V',
443
.doc = "Print program version", .group = -1 },
400
error_t parse_opt(int key, char *arg, __attribute__((unused))
401
struct argp_state *state){
447
__attribute__((nonnull(3)))
448
error_t parse_opt(int key, char *arg, struct argp_state *state){
405
453
case 'g': /* --global-options */
407
455
char *plugin_option;
408
456
while((plugin_option = strsep(&arg, ",")) != NULL){
409
if(plugin_option[0] == '\0'){
412
457
if(not add_argument(getplugin(NULL), plugin_option)){
413
perror("add_argument");
414
return ARGP_ERR_UNKNOWN;
419
464
case 'G': /* --global-env */
423
if(not add_environment(getplugin(NULL), arg, true)){
424
perror("add_environment");
465
if(add_environment(getplugin(NULL), arg, true)){
427
469
case 'o': /* --options-for */
429
char *plugin_name = strsep(&arg, ":");
430
if(plugin_name[0] == '\0'){
434
while((plugin_option = strsep(&arg, ",")) != NULL){
435
if(not add_argument(getplugin(plugin_name), plugin_option)){
436
perror("add_argument");
437
return ARGP_ERR_UNKNOWN;
471
char *option_list = strchr(arg, ':');
472
if(option_list == NULL){
473
argp_error(state, "No colon in \"%s\"", arg);
480
argp_error(state, "Empty plugin name");
485
while((option = strsep(&option_list, ",")) != NULL){
486
if(not add_argument(getplugin(arg), option)){
442
493
case 'E': /* --env-for */
447
495
char *envdef = strchr(arg, ':');
448
496
if(envdef == NULL){
497
argp_error(state, "No colon in \"%s\"", arg);
452
if(not add_environment(getplugin(arg), envdef+1, true)){
453
perror("add_environment");
504
argp_error(state, "Empty plugin name");
508
if(add_environment(getplugin(arg), envdef, true)){
457
513
case 'd': /* --disable */
459
515
plugin *p = getplugin(arg);
461
return ARGP_ERR_UNKNOWN;
466
522
case 'e': /* --enable */
468
524
plugin *p = getplugin(arg);
470
return ARGP_ERR_UNKNOWN;
475
531
case 128: /* --plugin-dir */
477
533
plugindir = strdup(arg);
478
if(plugindir == NULL){
534
if(plugindir != NULL){
482
538
case 129: /* --config-file */
483
539
/* This is already done by parse_opt_config_file() */
485
541
case 130: /* --userid */
487
tmpmax = strtoimax(arg, &tmp, 10);
542
tmp_id = strtoimax(arg, &tmp, 10);
488
543
if(errno != 0 or tmp == arg or *tmp != '\0'
489
or tmpmax != (uid_t)tmpmax){
490
fprintf(stderr, "Bad user ID number: \"%s\", using %"
491
PRIdMAX "\n", arg, (intmax_t)uid);
544
or tmp_id != (uid_t)tmp_id){
545
argp_error(state, "Bad user ID number: \"%s\", using %"
546
PRIdMAX, arg, (intmax_t)uid);
496
552
case 131: /* --groupid */
498
tmpmax = strtoimax(arg, &tmp, 10);
553
tmp_id = strtoimax(arg, &tmp, 10);
499
554
if(errno != 0 or tmp == arg or *tmp != '\0'
500
or tmpmax != (gid_t)tmpmax){
501
fprintf(stderr, "Bad group ID number: \"%s\", using %"
502
PRIdMAX "\n", arg, (intmax_t)gid);
555
or tmp_id != (gid_t)tmp_id){
556
argp_error(state, "Bad group ID number: \"%s\", using %"
557
PRIdMAX, arg, (intmax_t)gid);
507
563
case 132: /* --debug */
566
case 133: /* --plugin-helper-dir */
567
free(pluginhelperdir);
568
pluginhelperdir = strdup(arg);
569
if(pluginhelperdir != NULL){
574
* These reproduce what we would get without ARGP_NO_HELP
576
case '?': /* --help */
577
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
578
argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP);
579
__builtin_unreachable();
580
case -3: /* --usage */
581
state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */
582
argp_state_help(state, state->out_stream,
583
ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
584
__builtin_unreachable();
585
case 'V': /* --version */
586
fprintf(state->out_stream, "%s\n", argp_program_version);
511
590
* When adding more options before this line, remember to also add a
512
591
* "case" to the "parse_opt_config_file" function below.
648
759
/* Check for harmful errors and go to fallback. Other errors might
649
760
not affect opening plugins */
650
761
if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){
652
exitstatus = EXIT_FAILURE;
762
error(0, errno, "fopen");
763
exitstatus = EX_OSERR;
656
/* If there was any arguments from configuration file,
657
pass them to parser as command arguments */
767
/* If there were any arguments from the configuration file, pass
768
them to parser as command line arguments */
658
769
if(custom_argv != NULL){
659
ret = argp_parse(&argp, custom_argc, custom_argv, ARGP_IN_ORDER,
661
if(ret == ARGP_ERR_UNKNOWN){
662
fprintf(stderr, "Unknown error while parsing arguments\n");
663
exitstatus = EXIT_FAILURE;
770
ret = argp_parse(&argp, custom_argc, custom_argv,
771
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
779
error(0, errno, "argp_parse");
780
exitstatus = EX_OSERR;
783
exitstatus = EX_CONFIG;
668
788
/* Parse actual command line arguments, to let them override the
670
ret = argp_parse(&argp, argc, argv, ARGP_IN_ORDER, 0, NULL);
671
if(ret == ARGP_ERR_UNKNOWN){
672
fprintf(stderr, "Unknown error while parsing arguments\n");
673
exitstatus = EXIT_FAILURE;
790
ret = argp_parse(&argp, argc, argv,
791
ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP,
799
error(0, errno, "argp_parse");
800
exitstatus = EX_OSERR;
803
exitstatus = EX_USAGE;
808
char *pluginhelperenv;
810
ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",
811
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
813
bret = add_environment(getplugin(NULL), pluginhelperenv, true);
815
if(ret == -1 or not bret){
816
error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"
817
" environment variable to \"%s\" for all plugins\n",
818
pluginhelperdir != NULL ? pluginhelperdir : PHDIR);
821
free(pluginhelperenv);
678
for(plugin *p = plugin_list; p != NULL; p=p->next){
826
for(plugin *p = plugin_list; p != NULL; p = p->next){
679
827
fprintf(stderr, "Plugin: %s has %d arguments\n",
680
828
p->name ? p->name : "Global", p->argc - 1);
681
829
for(char **a = p->argv; *a != NULL; a++){
691
/* Strip permissions down to nobody */
840
/* Work around Debian bug #633582:
841
<https://bugs.debian.org/633582> */
842
int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
843
if(plugindir_fd == -1){
845
error(0, errno, "open(\"" PDIR "\")");
848
ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st));
850
error(0, errno, "fstat");
852
if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){
853
ret = fchown(plugindir_fd, uid, gid);
855
error(0, errno, "fchown");
863
/* Lower permissions */
866
error(0, errno, "setgid");
696
868
ret = setuid(uid);
870
error(0, errno, "setuid");
701
873
/* Open plugin directory with close_on_exec flag */
704
if(plugindir == NULL){
705
dir_fd = open(PDIR, O_RDONLY |
708
#else /* not O_CLOEXEC */
710
#endif /* not O_CLOEXEC */
713
dir_fd = open(plugindir, O_RDONLY |
716
#else /* not O_CLOEXEC */
718
#endif /* not O_CLOEXEC */
875
dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY |
878
#else /* not O_CLOEXEC */
880
#endif /* not O_CLOEXEC */
721
882
if(dir_fd == -1){
722
perror("Could not open plugin dir");
723
exitstatus = EXIT_FAILURE;
883
error(0, errno, "Could not open plugin dir");
884
exitstatus = EX_UNAVAILABLE;
728
889
/* Set the FD_CLOEXEC flag on the directory */
729
890
ret = set_cloexec_flag(dir_fd);
731
perror("set_cloexec_flag");
732
TEMP_FAILURE_RETRY(close(dir_fd));
733
exitstatus = EXIT_FAILURE;
892
error(0, errno, "set_cloexec_flag");
893
exitstatus = EX_OSERR;
736
896
#endif /* O_CLOEXEC */
738
dir = fdopendir(dir_fd);
740
perror("Could not open plugin dir");
741
TEMP_FAILURE_RETRY(close(dir_fd));
742
exitstatus = EXIT_FAILURE;
899
int good_name(const struct dirent * const dirent){
900
const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new",
901
"*.dpkg-old", "*.dpkg-bak",
902
"*.dpkg-divert", NULL };
904
#pragma GCC diagnostic push
905
#pragma GCC diagnostic ignored "-Wcast-qual"
907
for(const char **pat = (const char **)patterns;
908
*pat != NULL; pat++){
910
#pragma GCC diagnostic pop
912
if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD)
915
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
916
" matching pattern %s\n", dirent->d_name, *pat);
924
int numplugins = scandirat(dir_fd, ".", &direntries, good_name,
926
if(numplugins == -1){
927
error(0, errno, "Could not scan plugin dir");
929
exitstatus = EX_OSERR;
747
933
FD_ZERO(&rfds_all);
749
935
/* Read and execute any executable in the plugin directory*/
752
dirst = readdir(dir);
753
} while(dirst == NULL and errno == EINTR);
755
/* All directory entries have been processed */
759
exitstatus = EXIT_FAILURE;
765
d_name_len = strlen(dirst->d_name);
767
/* Ignore dotfiles, backup files and other junk */
769
bool bad_name = false;
771
const char const *bad_prefixes[] = { ".", "#", NULL };
773
const char const *bad_suffixes[] = { "~", "#", ".dpkg-new",
776
".dpkg-divert", NULL };
777
for(const char **pre = bad_prefixes; *pre != NULL; pre++){
778
size_t pre_len = strlen(*pre);
779
if((d_name_len >= pre_len)
780
and strncmp((dirst->d_name), *pre, pre_len) == 0){
782
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
783
" with bad prefix %s\n", dirst->d_name, *pre);
792
for(const char **suf = bad_suffixes; *suf != NULL; suf++){
793
size_t suf_len = strlen(*suf);
794
if((d_name_len >= suf_len)
795
and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf)
798
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
799
" with bad suffix %s\n", dirst->d_name, *suf);
812
if(plugindir == NULL){
813
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",
816
ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",
936
for(int i = 0; i < numplugins; i++){
938
int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);
940
error(0, errno, "Could not open plugin");
825
ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));
944
ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));
946
error(0, errno, "stat");
832
952
/* Ignore non-executable files */
833
953
if(not S_ISREG(st.st_mode)
834
or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){
954
or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name,
836
fprintf(stderr, "Ignoring plugin dir entry \"%s\""
837
" with bad type or mode\n", filename);
957
fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\""
958
" with bad type or mode\n",
959
plugindir != NULL ? plugindir : PDIR,
960
direntries[i]->d_name);
843
plugin *p = getplugin(dirst->d_name);
967
plugin *p = getplugin(direntries[i]->d_name);
969
error(0, errno, "getplugin");
851
976
fprintf(stderr, "Ignoring disabled plugin \"%s\"\n",
977
direntries[i]->d_name);
861
987
for(char **a = g->argv + 1; *a != NULL; a++){
862
988
if(not add_argument(p, *a)){
863
perror("add_argument");
989
error(0, errno, "add_argument");
866
992
/* Add global environment variables */
867
993
for(char **e = g->environ; *e != NULL; e++){
868
994
if(not add_environment(p, *e, false)){
869
perror("add_environment");
995
error(0, errno, "add_environment");
874
/* If this plugin has any environment variables, we will call
875
using execve and need to duplicate the environment from this
1000
/* If this plugin has any environment variables, we need to
1001
duplicate the environment from this process, too. */
877
1002
if(p->environ[0] != NULL){
878
1003
for(char **e = environ; *e != NULL; e++){
879
1004
if(not add_environment(p, *e, false)){
880
perror("add_environment");
1005
error(0, errno, "add_environment");
886
1012
ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));
1013
#else /* O_CLOEXEC */
1014
ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC));
1015
#endif /* O_CLOEXEC */
889
exitstatus = EXIT_FAILURE;
1017
error(0, errno, "pipe");
1018
exitstatus = EX_OSERR;
1019
free(direntries[i]);
1022
if(pipefd[0] >= FD_SETSIZE){
1023
fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0],
1027
exitstatus = EX_OSERR;
1028
free(direntries[i]);
892
1032
/* Ask OS to automatic close the pipe on exec */
893
1033
ret = set_cloexec_flag(pipefd[0]);
895
perror("set_cloexec_flag");
896
exitstatus = EXIT_FAILURE;
1035
error(0, errno, "set_cloexec_flag");
1038
exitstatus = EX_OSERR;
1039
free(direntries[i]);
899
1042
ret = set_cloexec_flag(pipefd[1]);
901
perror("set_cloexec_flag");
902
exitstatus = EXIT_FAILURE;
1044
error(0, errno, "set_cloexec_flag");
1047
exitstatus = EX_OSERR;
1048
free(direntries[i]);
1051
#endif /* not O_CLOEXEC */
905
1052
/* Block SIGCHLD until process is safely in process list */
906
1053
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,
907
1054
&sigchld_action.sa_mask,
910
perror("sigprocmask");
911
exitstatus = EXIT_FAILURE;
1057
error(0, errno, "sigprocmask");
1058
exitstatus = EX_OSERR;
1059
free(direntries[i]);
914
1062
/* Starting a new process to be watched */
918
1066
} while(pid == -1 and errno == EINTR);
921
exitstatus = EXIT_FAILURE;
1068
error(0, errno, "fork");
1069
TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
1070
&sigchld_action.sa_mask, NULL));
1073
exitstatus = EX_OSERR;
1074
free(direntries[i]);
925
1078
/* this is the child process */
926
1079
ret = sigaction(SIGCHLD, &old_sigchld_action, NULL);
1081
error(0, errno, "sigaction");
931
1084
ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);
933
perror("sigprocmask");
1086
error(0, errno, "sigprocmask");
937
1090
ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */
1092
error(0, errno, "dup2");
944
/* If dir has no file descriptor, we could not set FD_CLOEXEC
945
above and must now close it manually here. */
948
if(p->environ[0] == NULL){
949
if(execv(filename, p->argv) < 0){
954
if(execve(filename, p->argv, p->environ) < 0){
1096
if(fexecve(plugin_fd, p->argv,
1097
(p->environ[0] != NULL) ? p->environ : environ) < 0){
1098
error(0, errno, "fexecve for %s/%s",
1099
plugindir != NULL ? plugindir : PDIR,
1100
direntries[i]->d_name);
961
1105
/* Parent process */
962
TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of
965
plugin *new_plugin = getplugin(dirst->d_name);
1106
close(pipefd[1]); /* Close unused write end of pipe */
1108
plugin *new_plugin = getplugin(direntries[i]->d_name);
966
1109
if(new_plugin == NULL){
1110
error(0, errno, "getplugin");
968
1111
ret = (int)(TEMP_FAILURE_RETRY
969
1112
(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,
972
perror("sigprocmask");
1115
error(0, errno, "sigprocmask");
974
exitstatus = EXIT_FAILURE;
1117
exitstatus = EX_OSERR;
1118
free(direntries[i]);
1121
free(direntries[i]);
978
1123
new_plugin->pid = pid;
979
1124
new_plugin->fd = pipefd[0];
1127
fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n",
1128
new_plugin->name, (intmax_t) (new_plugin->pid));
981
1131
/* Unblock SIGCHLD so signal handler can be run if this process
982
1132
has already completed */
983
1133
ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,
984
1134
&sigchld_action.sa_mask,
987
perror("sigprocmask");
988
exitstatus = EXIT_FAILURE;
1137
error(0, errno, "sigprocmask");
1138
exitstatus = EX_OSERR;
992
FD_SET(new_plugin->fd, &rfds_all); /* Spurious warning from
1142
FD_SET(new_plugin->fd, &rfds_all);
995
1144
if(maxfd < new_plugin->fd){
996
1145
maxfd = new_plugin->fd;
1000
TEMP_FAILURE_RETRY(closedir(dir));
1002
1153
free_plugin(getplugin(NULL));
1004
1155
for(plugin *p = plugin_list; p != NULL; p = p->next){
1090
1237
bool bret = print_out_password(proc->buffer,
1091
1238
proc->buffer_length);
1093
perror("print_out_password");
1094
exitstatus = EXIT_FAILURE;
1240
error(0, errno, "print_out_password");
1241
exitstatus = EX_IOERR;
1099
1246
/* This process has not completed. Does it have any output? */
1100
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ /* Spurious
1247
if(proc->eof or not FD_ISSET(proc->fd, &rfds)){
1103
1248
/* This process had nothing to say at this time */
1104
1249
proc = proc->next;
1107
1252
/* Before reading, make the process' data buffer large enough */
1108
1253
if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){
1109
proc->buffer = realloc(proc->buffer, proc->buffer_size
1110
+ (size_t) BUFFER_SIZE);
1111
if(proc->buffer == NULL){
1113
exitstatus = EXIT_FAILURE;
1254
char *new_buffer = realloc(proc->buffer, proc->buffer_size
1255
+ (size_t) BUFFER_SIZE);
1256
if(new_buffer == NULL){
1257
error(0, errno, "malloc");
1258
exitstatus = EX_OSERR;
1261
proc->buffer = new_buffer;
1116
1262
proc->buffer_size += BUFFER_SIZE;
1118
1264
/* Read from the process */