/mandos/trunk : revision 359

110

}

111

}

112

/* Create a new plugin */

113

plugin *new_plugin = NULL;

114

do {

115

new_plugin = malloc(sizeof(plugin));

116

} while(new_plugin == NULL and errno == EINTR);

113

plugin *new_plugin = malloc(sizeof(plugin));

117

114

if(new_plugin == NULL){

118

115

return NULL;

119

116

}

120

117

char *copy_name = NULL;

121

118

if(name != NULL){

122

do {

123

copy_name = strdup(name);

124

} while(copy_name == NULL and errno == EINTR);

119

copy_name = strdup(name);

125

120

if(copy_name == NULL){

126

121

free(new_plugin);

127

122

return NULL;

133

128

.disabled = false,

134

129

.next = plugin_list };

135

130

136

do {

137

new_plugin->argv = malloc(sizeof(char *) * 2);

138

} while(new_plugin->argv == NULL and errno == EINTR);

131

new_plugin->argv = malloc(sizeof(char *) * 2);

139

132

if(new_plugin->argv == NULL){

140

133

free(copy_name);

141

134

free(new_plugin);

144

137

new_plugin->argv[0] = copy_name;

145

138

new_plugin->argv[1] = NULL;

146

139

147

do {

148

new_plugin->environ = malloc(sizeof(char *));

149

} while(new_plugin->environ == NULL and errno == EINTR);

140

new_plugin->environ = malloc(sizeof(char *));

150

141

if(new_plugin->environ == NULL){

151

142

free(copy_name);

152

143

free(new_plugin->argv);

164

155

static bool add_to_char_array(const char *new, char ***array,

165

156

int *len){

166

157

/* Resize the pointed-to array to hold one more pointer */

167

do {

168

*array = realloc(*array, sizeof(char *)

169

* (size_t) ((*len) + 2));

170

} while(*array == NULL and errno == EINTR);

158

*array = realloc(*array, sizeof(char *)

159

* (size_t) ((*len) + 2));

171

160

/* Malloc check */

172

161

if(*array == NULL){

173

162

return false;

174

163

}

175

164

/* Make a copy of the new string */

176

char *copy;

177

do {

178

copy = strdup(new);

179

} while(copy == NULL and errno == EINTR);

165

char *copy = strdup(new);

180

166

if(copy == NULL){

181

167

return false;

182

168

}

208

194

if(strncmp(*e, def, namelen + 1) == 0){

209

195

/* It already exists */

210

196

if(replace){

211

char *new;

212

do {

213

new = realloc(*e, strlen(def) + 1);

214

} while(new == NULL and errno == EINTR);

197

char *new = realloc(*e, strlen(def) + 1);

215

198

if(new == NULL){

216

199

return false;

217

200

}

230

213

| [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |

231

214

*/

232

215

static int set_cloexec_flag(int fd){

233

int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));

216

int ret = fcntl(fd, F_GETFD, 0);

234

217

/* If reading the flags failed, return error indication now. */

235

218

if(ret < 0){

236

219

return ret;

237

220

}

238

221

/* Store modified flag word in the descriptor. */

239

return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,

240

ret | FD_CLOEXEC));

222

return fcntl(fd, F_SETFD, ret | FD_CLOEXEC);

241

223

}

242

224

243

225

335

317

fd_set rfds_all;

336

318

int ret, maxfd = 0;

337

319

ssize_t sret;

320

intmax_t tmpmax;

338

321

uid_t uid = 65534;

339

322

gid_t gid = 65534;

340

323

bool debug = false;

399

382

400

383

error_t parse_opt(int key, char *arg, __attribute__((unused))

401

384

struct argp_state *state){

385

char *tmp;

402

386

switch(key){

403

char *tmp;

404

intmax_t tmpmax;

405

387

case 'g': /* --global-options */

406

388

if(arg != NULL){

407

389

char *plugin_option;

635

617

custom_argv[custom_argc] = NULL;

636

618

}

637

619

}

638

do {

620

do{

639

621

ret = fclose(conffp);

640

} while(ret == EOF and errno == EINTR);

622

}while(ret == EOF and errno == EINTR);

641

623

if(ret == EOF){

642

624

perror("fclose");

643

625

exitstatus = EXIT_FAILURE;

727

709

728

710

/* Read and execute any executable in the plugin directory*/

729

711

while(true){

730

do {

731

dirst = readdir(dir);

732

} while(dirst == NULL and errno == EINTR);

712

dirst = readdir(dir);

733

713

734

714

/* All directory entries have been processed */

735

715

if(dirst == NULL){

789

769

790

770

char *filename;

791

771

if(plugindir == NULL){

792

ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, PDIR "/%s",

793

dirst->d_name));

772

ret = asprintf(&filename, PDIR "/%s", dirst->d_name);

794

773

} else {

795

ret = (int)TEMP_FAILURE_RETRY(asprintf(&filename, "%s/%s",

796

plugindir,

797

dirst->d_name));

774

ret = asprintf(&filename, "%s/%s", plugindir, dirst->d_name);

798

775

}

799

776

if(ret < 0){

800

777

perror("asprintf");

801

778

continue;

802

779

}

803

780

804

ret = (int)TEMP_FAILURE_RETRY(stat(filename, &st));

781

ret = stat(filename, &st);

805

782

if(ret == -1){

806

783

perror("stat");

807

784

free(filename);

809

786

}

810

787

811

788

/* Ignore non-executable files */

812

if(not S_ISREG(st.st_mode)

813

or (TEMP_FAILURE_RETRY(access(filename, X_OK)) != 0)){

789

if(not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){

814

790

if(debug){

815

791

fprintf(stderr, "Ignoring plugin dir entry \"%s\""

816

792

" with bad type or mode\n", filename);

862

838

}

863

839

864

840

int pipefd[2];

865

ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd));

841

ret = pipe(pipefd);

866

842

if(ret == -1){

867

843

perror("pipe");

868

844

exitstatus = EXIT_FAILURE;

882

858

goto fallback;

883

859

}

884

860

/* Block SIGCHLD until process is safely in process list */

885

ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK,

886

&sigchld_action.sa_mask,

887

NULL));

861

ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);

888

862

if(ret < 0){

889

863

perror("sigprocmask");

890

864

exitstatus = EXIT_FAILURE;

891

865

goto fallback;

892

866

}

893

867

/* Starting a new process to be watched */

894

pid_t pid;

895

do {

896

pid = fork();

897

} while(pid == -1 and errno == EINTR);

868

pid_t pid = fork();

898

869

if(pid == -1){

899

870

perror("fork");

900

871

exitstatus = EXIT_FAILURE;

938

909

/* no return */

939

910

}

940

911

/* Parent process */

941

TEMP_FAILURE_RETRY(close(pipefd[1])); /* Close unused write end of

942

pipe */

912

close(pipefd[1]); /* Close unused write end of pipe */

943

913

free(filename);

944

914

plugin *new_plugin = getplugin(dirst->d_name);

945

915

if(new_plugin == NULL){

946

916

perror("getplugin");

947

ret = (int)(TEMP_FAILURE_RETRY

948

(sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,

949

NULL)));

917

ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);

950

918

if(ret < 0){

951

919

perror("sigprocmask");

952

920

}

959

927

960

928

/* Unblock SIGCHLD so signal handler can be run if this process

961

929

has already completed */

962

ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK,

963

&sigchld_action.sa_mask,

964

NULL));

930

ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL);

965

931

if(ret < 0){

966

932

perror("sigprocmask");

967

933

exitstatus = EXIT_FAILURE;

975

941

}

976

942

}

977

943

978

TEMP_FAILURE_RETRY(closedir(dir));

944

closedir(dir);

979

945

dir = NULL;

980

946

free_plugin(getplugin(NULL));

981

947

994

960

while(plugin_list){

995

961

fd_set rfds = rfds_all;

996

962

int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL);

997

if(select_ret == -1 and errno != EINTR){

963

if(select_ret == -1){

998

964

perror("select");

999

965

exitstatus = EXIT_FAILURE;

1000

966

goto fallback;

1031

997

FD_CLR(proc->fd, &rfds_all);

1032

998

1033

999

/* Block signal while modifying process_list */

1034

ret = (int)TEMP_FAILURE_RETRY(sigprocmask

1035

(SIG_BLOCK,

1036

&sigchld_action.sa_mask,

1037

NULL));

1000

ret = sigprocmask(SIG_BLOCK, &sigchld_action.sa_mask, NULL);

1038

1001

if(ret < 0){

1039

1002

perror("sigprocmask");

1040

1003

exitstatus = EXIT_FAILURE;

1046

1009

proc = next_plugin;

1047

1010

1048

1011

/* We are done modifying process list, so unblock signal */

1049

ret = (int)(TEMP_FAILURE_RETRY

1050

(sigprocmask(SIG_UNBLOCK,

1051

&sigchld_action.sa_mask, NULL)));

1012

ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask,

1013

NULL);

1052

1014

if(ret < 0){

1053

1015

perror("sigprocmask");

1054

1016

exitstatus = EXIT_FAILURE;

1091

1053

proc->buffer_size += BUFFER_SIZE;

1092

1054

}

1093

1055

/* Read from the process */

1094

sret = TEMP_FAILURE_RETRY(read(proc->fd,

1095

proc->buffer

1096

+ proc->buffer_length,

1097

BUFFER_SIZE));

1056

sret = read(proc->fd, proc->buffer + proc->buffer_length,

1057

BUFFER_SIZE);

1098

1058

if(sret < 0){

1099

1059

/* Read error from this process; ignore the error */

1100

1060

proc = proc->next;

1162

1122

}

1163

1123

1164

1124

/* Wait for any remaining child processes to terminate */

1165

do {

1125

do{

1166

1126

ret = wait(NULL);

1167

1127

} while(ret >= 0);

1168

1128

if(errno != ECHILD){