/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: 2014-03-06 02:26:04 UTC
  • Revision ID: teddy@recompile.se-20140306022604-4uc43taz25cflgi3
Bug fix: Free all memory and give better messages when memory is full.

* plugin-runner.c (add_to_char_array): Bug fix: If realloc fails, do
                                       not change old array pointer.
  (add_environment): Bug fix: If realloc fails, do not change old
                     environment pointer.  Also rename "e" to "envdef"
                     for clarity.
  (main): Bug fix: If realloc fails, do not change old pointers.  Also
          wrap "#pragma GCC" with "#ifdef ___GNUC___".
* plugins.d/mandos-client.c (incbuffer): Bug fix: if realloc fails,
                                         free old buffer.
  (run_network_hooks): Moved variables "directory" and "ret" to their
                       innermost possible scope.
  (take_down_interface): Moved variables "sd", "ret_errno", and
                         "ret_setflags" to their innermost possible
                         scope.
  (main): Removed variable "interfaces_hooks_size".  Also, if argz_add
          fails when adding all found interfaces, the error message
          will now be correct.  Also print error message if, after
          having taken up an interface, argz_add fails to add
          interface to list of interfaces to be taken down.
* plugins.d/mandos-client.xml (OPTIONS): Explain better what "none"
                                         means as argument to
                                         "--interface" by negating
                                         sense.
* plugins.d/password-prompt.c (fprintf_plus): Removed (unused).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
198
198
size_t incbuffer(char **buffer, size_t buffer_length,
199
199
                 size_t buffer_capacity){
200
200
  if(buffer_length + BUFFER_SIZE > buffer_capacity){
201
 
    *buffer = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
202
 
    if(buffer == NULL){
 
201
    char *new_buf = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
 
202
    if(new_buf == NULL){
 
203
      int old_errno = errno;
 
204
      free(*buffer);
 
205
      errno = old_errno;
 
206
      *buffer = NULL;
203
207
      return 0;
204
208
    }
 
209
    *buffer = new_buf;
205
210
    buffer_capacity += BUFFER_SIZE;
206
211
  }
207
212
  return buffer_capacity;
1488
1493
bool run_network_hooks(const char *mode, const char *interface,
1489
1494
                       const float delay){
1490
1495
  struct dirent **direntries;
1491
 
  struct dirent *direntry;
1492
 
  int ret;
1493
1496
  int numhooks = scandir(hookdir, &direntries, runnable_hook,
1494
1497
                         alphasort);
1495
1498
  if(numhooks == -1){
1502
1505
      perror_plus("scandir");
1503
1506
    }
1504
1507
  } else {
 
1508
    struct dirent *direntry;
 
1509
    int ret;
1505
1510
    int devnull = open("/dev/null", O_RDONLY);
1506
1511
    for(int i = 0; i < numhooks; i++){
1507
1512
      direntry = direntries[i];
1727
1732
}
1728
1733
 
1729
1734
error_t take_down_interface(const char *const interface){
1730
 
  int sd = -1;
1731
1735
  error_t old_errno = errno;
1732
 
  error_t ret_errno = 0;
1733
 
  int ret, ret_setflags;
1734
1736
  struct ifreq network;
1735
1737
  unsigned int if_index = if_nametoindex(interface);
1736
1738
  if(if_index == 0){
1739
1741
    return ENXIO;
1740
1742
  }
1741
1743
  if(interface_is_up(interface)){
 
1744
    error_t ret_errno = 0;
1742
1745
    if(not get_flags(interface, &network) and debug){
1743
1746
      ret_errno = errno;
1744
1747
      fprintf_plus(stderr, "Failed to get flags for interface "
1747
1750
    }
1748
1751
    network.ifr_flags &= ~(short)IFF_UP; /* clear flag */
1749
1752
    
1750
 
    sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
 
1753
    int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1751
1754
    if(sd < 0){
1752
1755
      ret_errno = errno;
1753
1756
      perror_plus("socket");
1763
1766
    /* Raise priviliges */
1764
1767
    raise_privileges();
1765
1768
    
1766
 
    ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
 
1769
    int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1767
1770
    ret_errno = errno;
1768
1771
    
1769
1772
    /* Lower privileges */
1770
1773
    lower_privileges();
1771
1774
    
1772
1775
    /* Close the socket */
1773
 
    ret = (int)TEMP_FAILURE_RETRY(close(sd));
 
1776
    int ret = (int)TEMP_FAILURE_RETRY(close(sd));
1774
1777
    if(ret == -1){
1775
1778
      perror_plus("close");
1776
1779
    }
1809
1812
  const char *seckey = PATHDIR "/" SECKEY;
1810
1813
  const char *pubkey = PATHDIR "/" PUBKEY;
1811
1814
  char *interfaces_hooks = NULL;
1812
 
  size_t interfaces_hooks_size = 0;
1813
1815
  
1814
1816
  bool gnutls_initialized = false;
1815
1817
  bool gpgme_initialized = false;
2070
2072
        goto end;
2071
2073
      }
2072
2074
      memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size);
2073
 
      interfaces_hooks_size = mc.interfaces_size;
2074
 
      argz_stringify(interfaces_hooks, interfaces_hooks_size,
2075
 
                     (int)',');
 
2075
      argz_stringify(interfaces_hooks, mc.interfaces_size, (int)',');
2076
2076
    }
2077
2077
    if(not run_network_hooks("start", interfaces_hooks != NULL ?
2078
2078
                             interfaces_hooks : "", delay)){
2171
2171
        ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size,
2172
2172
                             direntries[i]->d_name);
2173
2173
        if(ret_errno != 0){
 
2174
          errno = ret_errno;
2174
2175
          perror_plus("argz_add");
2175
2176
          continue;
2176
2177
        }
2219
2220
          ret_errno = argz_add(&interfaces_to_take_down,
2220
2221
                               &interfaces_to_take_down_size,
2221
2222
                               interface);
 
2223
          if(ret_errno != 0){
 
2224
            errno = ret_errno;
 
2225
            perror_plus("argz_add");
 
2226
          }
2222
2227
        }
2223
2228
      }
2224
2229
    }