/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2018-02-18 01:03:48 UTC
  • Revision ID: teddy@recompile.se-20180218010348-hhjfox5t4py5n5zh
Client: Bug fix: Possible memory leak if failing to open /dev/null

* plugins.d/mandos-client.d (run_network_hooks): Try to open /dev/null
  before reading network hook dir in order to fail early in that case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
9
9
 * "browse_callback", and parts of "main".
10
10
 * 
11
11
 * Everything else is
12
 
 * Copyright © 2008-2017 Teddy Hogeborn
13
 
 * Copyright © 2008-2017 Björn Påhlsson
 
12
 * Copyright © 2008-2018 Teddy Hogeborn
 
13
 * Copyright © 2008-2018 Björn Påhlsson
14
14
 * 
15
15
 * This file is part of Mandos.
16
16
 * 
1923
1923
      return;
1924
1924
    }
1925
1925
  }
 
1926
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
 
1927
  if(devnull == -1){
 
1928
    perror_plus("open(\"/dev/null\", O_RDONLY)");
 
1929
    return;
 
1930
  }
1926
1931
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1927
1932
                           runnable_hook, alphasort);
1928
1933
  if(numhooks == -1){
1929
1934
    perror_plus("scandir");
 
1935
    close(devnull);
1930
1936
    return;
1931
1937
  }
1932
1938
  struct dirent *direntry;
1933
1939
  int ret;
1934
 
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
1935
 
  if(devnull == -1){
1936
 
    perror_plus("open(\"/dev/null\", O_RDONLY)");
1937
 
    return;
1938
 
  }
1939
1940
  for(int i = 0; i < numhooks; i++){
1940
1941
    direntry = direntries[i];
1941
1942
    if(debug){
3083
3084
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3084
3085
            dret = 0;
3085
3086
          }
3086
 
          if(dret == -1){
 
3087
          if((dret == -1) and (errno != ENOENT)){
3087
3088
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3088
3089
                         direntries[i]->d_name, strerror(errno));
3089
3090
          }