/mandos/trunk : revision 705

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

Committer: Teddy Hogeborn
Date: 2014-06-14 23:43:07 UTC
Revision ID: teddy@recompile.se-20140614234307-i0mh9r2n4orkqtki

plugin-runner: Release memory and close FD's correctly in all cases.

* plugins.d/mandos-client.c (main): Init "direntries" to NULL.  Close
                                    "dir_fd" at fallback label.  Do
                                    not free "direntries" if
                                    scandirat() or scandir() failed.
                                    Do free(direntries) at fallback
                                    label.

Show diffs side-by-side

added added

removed removed

plugin-runner.c

#define BUFFER_SIZE 256

#define PDIR "/lib/mandos/plugins.d"

#define PHDIR "/lib/mandos/plugin-helpers"

#define AFILE "/conf/conf.d/mandos/plugin-runner.conf"

const char *argp_program_version = "plugin-runner " VERSION;

348

347

349

348

int main(int argc, char *argv[]){

350

349

char *plugindir = NULL;

351

char *pluginhelperdir = NULL;

352

350

char *argfile = NULL;

353

351

FILE *conffp;

354

352

struct dirent **direntries = NULL;

416

414

.doc = "Group ID the plugins will run as", .group = 3 },

417

415

{ .name = "debug", .key = 132,

418

416

.doc = "Debug mode", .group = 4 },

419

{ .name = "plugin-helper-dir", .key = 133,

420

.arg = "DIRECTORY",

421

.doc = "Specify a different plugin helper directory",

422

.group = 2 },

423

417

424

418

* These reproduce what we would get without ARGP_NO_HELP

425

419

551

545

case 132: /* --debug */

552

546

debug = true;

553

547

break;

554

case 133: /* --plugin-helper-dir */

555

free(pluginhelperdir);

556

pluginhelperdir = strdup(arg);

557

if(pluginhelperdir != NULL){

558

errno = 0;

559

}

560

break;

561

548

562

549

* These reproduce what we would get without ARGP_NO_HELP

563

550

614

601

case 130: /* --userid */

615

602

case 131: /* --groupid */

616

603

case 132: /* --debug */

617

case 133: /* --plugin-helper-dir */

618

604

case '?': /* --help */

619

605

case -3: /* --usage */

620

606

case 'V': /* --version */

775

761

goto fallback;

776

762

}

777

763

778

{

779

char *pluginhelperenv;

780

bool bret = true;

781

ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s",

782

pluginhelperdir != NULL ? pluginhelperdir : PHDIR);

783

if(ret != -1){

784

bret = add_environment(getplugin(NULL), pluginhelperenv, true);

785

}

786

if(ret == -1 or not bret){

787

error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR"

788

" environment variable to \"%s\" for all plugins\n",

789

pluginhelperdir != NULL ? pluginhelperdir : PHDIR);

790

}

791

if(ret != -1){

792

free(pluginhelperenv);

793

}

794

}

795

796

764

if(debug){

797

765

for(plugin *p = plugin_list; p != NULL; p=p->next){

798

766

fprintf(stderr, "Plugin: %s has %d arguments\n",

919

887

int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY);

920

888

if(plugin_fd == -1){

921

889

error(0, errno, "Could not open plugin");

922

free(direntries[i]);

923

890

continue;

924

891

}

925

892

ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st));

926

893

if(ret == -1){

927

894

error(0, errno, "stat");

928

895

TEMP_FAILURE_RETRY(close(plugin_fd));

929

free(direntries[i]);

930

896

continue;

931

897

}

932

898

941

907

direntries[i]->d_name);

942

908

}

943

909

TEMP_FAILURE_RETRY(close(plugin_fd));

944

free(direntries[i]);

945

910

continue;

946

911

}

947

912

949

914

if(p == NULL){

950

915

error(0, errno, "getplugin");

951

916

TEMP_FAILURE_RETRY(close(plugin_fd));

952

free(direntries[i]);

953

917

continue;

954

918

}

955

919

if(p->disabled){

958

922

direntries[i]->d_name);

959

923

}

960

924

TEMP_FAILURE_RETRY(close(plugin_fd));

961

free(direntries[i]);

962

925

continue;

963

926

}

964

927

{

997

960

if(ret == -1){

998

961

error(0, errno, "pipe");

999

962

exitstatus = EX_OSERR;

1000

free(direntries[i]);

1001

963

goto fallback;

1002

964

}

1003

965

if(pipefd[0] >= FD_SETSIZE){

1006

968

TEMP_FAILURE_RETRY(close(pipefd[0]));

1007

969

TEMP_FAILURE_RETRY(close(pipefd[1]));

1008

970

exitstatus = EX_OSERR;

1009

free(direntries[i]);

1010

971

goto fallback;

1011

972

}

1012

973

#ifndef O_CLOEXEC

1017

978

TEMP_FAILURE_RETRY(close(pipefd[0]));

1018

979

TEMP_FAILURE_RETRY(close(pipefd[1]));

1019

980

exitstatus = EX_OSERR;

1020

free(direntries[i]);

1021

981

goto fallback;

1022

982

}

1023

983

ret = set_cloexec_flag(pipefd[1]);

1026

986

TEMP_FAILURE_RETRY(close(pipefd[0]));

1027

987

TEMP_FAILURE_RETRY(close(pipefd[1]));

1028

988

exitstatus = EX_OSERR;

1029

free(direntries[i]);

1030

989

goto fallback;

1031

990

}

1032

991

#endif /* not O_CLOEXEC */

1037

996

if(ret < 0){

1038

997

error(0, errno, "sigprocmask");

1039

998

exitstatus = EX_OSERR;

1040

free(direntries[i]);

1041

999

goto fallback;

1042

1000

}

1043

1001

/* Starting a new process to be watched */

1052

1010

TEMP_FAILURE_RETRY(close(pipefd[0]));

1053

1011

TEMP_FAILURE_RETRY(close(pipefd[1]));

1054

1012

exitstatus = EX_OSERR;

1055

free(direntries[i]);

1056

1013

goto fallback;

1057

1014

}

1058

1015

if(pid == 0){

1097

1054

error(0, errno, "sigprocmask");

1098

1055

}

1099

1056

exitstatus = EX_OSERR;

1100

free(direntries[i]);

1101

1057

goto fallback;

1102

1058

}

1103

free(direntries[i]);

1104

1059

1105

1060

new_plugin->pid = pid;

1106

1061

new_plugin->fd = pipefd[0];

1368

1323

free_plugin_list();

1369

1324

1370

1325

free(plugindir);

1371

free(pluginhelperdir);

1372

1326

free(argfile);

1373

1327

1374

1328

return exitstatus;

Older »