/mandos/release

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

« back to all changes in this revision

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

  • Committer: Teddy Hogeborn
  • Date: 2018-02-19 21:32:07 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 366.
  • Revision ID: teddy@recompile.se-20180219213207-0un0ylegx390pftq
Client bug fixes: Fix file descriptor leaks

* plugin-helpers/mandos-client.c (init_gnutls_global, get_flags):
  Always close files and sockets after they are used.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
613
613
        }
614
614
        params.size += (unsigned int)bytes_read;
615
615
      }
 
616
      close(dhpfile);
616
617
      if(params.data == NULL){
617
618
        dhparamsfilename = NULL;
618
619
      }
1655
1656
      perror_plus("ioctl SIOCGIFFLAGS");
1656
1657
      errno = old_errno;
1657
1658
    }
 
1659
    close(s);
1658
1660
    return false;
1659
1661
  }
 
1662
  close(s);
1660
1663
  return true;
1661
1664
}
1662
1665
 
1923
1926
      return;
1924
1927
    }
1925
1928
  }
 
1929
  int devnull = (int)TEMP_FAILURE_RETRY(open("/dev/null", O_RDONLY));
 
1930
  if(devnull == -1){
 
1931
    perror_plus("open(\"/dev/null\", O_RDONLY)");
 
1932
    return;
 
1933
  }
1926
1934
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1927
1935
                           runnable_hook, alphasort);
1928
1936
  if(numhooks == -1){
1929
1937
    perror_plus("scandir");
 
1938
    close(devnull);
1930
1939
    return;
1931
1940
  }
1932
1941
  struct dirent *direntry;
1933
1942
  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
1943
  for(int i = 0; i < numhooks; i++){
1940
1944
    direntry = direntries[i];
1941
1945
    if(debug){
3061
3065
                                                | O_PATH));
3062
3066
    if(dir_fd == -1){
3063
3067
      perror_plus("open");
 
3068
      return;
3064
3069
    }
3065
3070
    int numentries = scandirat(dir_fd, ".", &direntries,
3066
3071
                               notdotentries, alphasort);
3083
3088
            clean_dir_at(dir_fd, direntries[i]->d_name, level+1);
3084
3089
            dret = 0;
3085
3090
          }
3086
 
          if(dret == -1){
 
3091
          if((dret == -1) and (errno != ENOENT)){
3087
3092
            fprintf_plus(stderr, "unlink(\"%s/%s\"): %s\n", dirname,
3088
3093
                         direntries[i]->d_name, strerror(errno));
3089
3094
          }
3093
3098
      
3094
3099
      /* need to clean even if 0 because man page doesn't specify */
3095
3100
      free(direntries);
3096
 
      if(numentries == -1){
3097
 
        perror_plus("scandirat");
3098
 
      }
3099
3101
      dret = unlinkat(base, dirname, AT_REMOVEDIR);
3100
3102
      if(dret == -1 and errno != ENOENT){
3101
3103
        perror_plus("rmdir");