Commit 7e65871c authored by Karsten Loesing's avatar Karsten Loesing Committed by Sebastian Hahn
Browse files

Fix a memory corruption bug while collecting bridge stats 

We accidentally freed the internal buffer for bridge stats when we
were writing the bridge stats file or honoring a control port
request for said data. Change the interfaces for
geoip_get_bridge_stats* to prevent these problems, and remove the
offending free/add a tor_strdup.

Fixes bug 1208.
parent 2d3f21e9

ChangeLog

+7 −0
Original line number Diff line number Diff line 
Changes in version 0.2.2.8-alpha - 2010-??-??

  o Major bugfixes:

    - Fix a memory corruption bug on bridges that occured during the

      inclusion of stats data in extra-info descriptors. Also fix the

      interface for geoip_get_bridge_stats* to prevent similar bugs in

      the future. Diagnosis by Tas, patch by Karsten and Sebastian.

      Fixes bug 1208; bugfix on 0.2.2.7-alpha.



  o Minor bugfixes:

    - Ignore OutboundBindAddress when connecting to localhost.

      Connections to localhost need to come _from_ localhost, or else

src/or/control.c

+2 −2
Original line number Diff line number Diff line
@@ -1755,10 +1755,10 @@ getinfo_helper_events(control_connection_t *control_conn, 
                 "information", question);

      }

    } else if (!strcmp(question, "status/clients-seen")) {

      char *bridge_stats = geoip_get_bridge_stats_controller(time(NULL));

      const char *bridge_stats = geoip_get_bridge_stats_controller(time(NULL));

      if (!bridge_stats)

        return -1;

      *answer = bridge_stats;

      *answer = tor_strdup(bridge_stats);

    } else {

      return 0;

    }

src/or/geoip.c

+2 −2
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ load_bridge_stats(time_t now) 


/** Return most recent bridge statistics for inclusion in extra-info

 * descriptors, or NULL if we don't have recent bridge statistics. */

char *

const char *

geoip_get_bridge_stats_extrainfo(time_t now)

{

  load_bridge_stats(now);
@@ -1263,7 +1263,7 @@ geoip_get_bridge_stats_extrainfo(time_t now) 


/** Return most recent bridge statistics to be returned to controller

 * clients, or NULL if we don't have recent bridge statistics. */

char *

const char *

geoip_get_bridge_stats_controller(time_t now)

{

  load_bridge_stats(now);

src/or/microdesc.c

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ dump_microdescriptor(FILE *f, microdesc_t *md, size_t *annotation_len_out) 
  md->off = (off_t) ftell(f);

  written = fwrite(md->body, 1, md->bodylen, f);

  if (written != md->bodylen) {

    log_warn(LD_DIR, "Couldn't dump microdescriptor (wrote %lu out of %lu): %s",

    log_warn(LD_DIR,

             "Couldn't dump microdescriptor (wrote %lu out of %lu): %s",

             (unsigned long)written, (unsigned long)md->bodylen,

             strerror(ferror(f)));

    return -1;

src/or/or.h

+2 −2
Original line number Diff line number Diff line
@@ -4137,8 +4137,8 @@ void geoip_entry_stats_init(time_t now); 
void geoip_entry_stats_write(time_t now);

void geoip_bridge_stats_init(time_t now);

time_t geoip_bridge_stats_write(time_t now);

char *geoip_get_bridge_stats_extrainfo(time_t);

char *geoip_get_bridge_stats_controller(time_t);

const char *geoip_get_bridge_stats_extrainfo(time_t);

const char *geoip_get_bridge_stats_controller(time_t);



/********************************* hibernate.c **********************/