nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a tricky crash: making the_directory heap-allocated (so we could refcount it and have multiple instances as neeeded) means that calls to dirserv_regenerate_directory could invalidate the auth_dir value passed to dirserv_pick_cached_dir_obj. Big fun.

Browse Source 
svn:r6663
This commit is contained in:
Nick Mathewson 2006-06-18 21:30:03 +00:00
parent 2552d5e60f
commit 3f7f069a05
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/or/dirserv.c
View File

@ -36,7 +36,7 @@ static int runningrouters_is_dirty = 1;
static int the_v2_networkstatus_is_dirty = 1; static int the_v2_networkstatus_is_dirty = 1;
static void directory_remove_invalid(void); static void directory_remove_invalid(void);
static int dirserv_regenerate_directory(void); static cached_dir_t *dirserv_regenerate_directory(void);
static char *format_versions_list(config_line_t *ln); static char *format_versions_list(config_line_t *ln);
/* Should be static; exposed for testing */ /* Should be static; exposed for testing */
int add_fingerprint_to_dir(const char *nickname, const char *fp, int add_fingerprint_to_dir(const char *nickname, const char *fp,
@ -1036,7 +1036,7 @@ dirserv_set_cached_networkstatus_v2(const char *networkstatus,
static cached_dir_t * static cached_dir_t *
dirserv_pick_cached_dir_obj(cached_dir_t *cache_src, dirserv_pick_cached_dir_obj(cached_dir_t *cache_src,
cached_dir_t *auth_src, cached_dir_t *auth_src,
time_t dirty, int (*regenerate)(void), time_t dirty, cached_dir_t *(*regenerate)(void),
const char *name, const char *name,
int is_v1_object) int is_v1_object)
{ {
@ -1049,7 +1049,7 @@ dirserv_pick_cached_dir_obj(cached_dir_t *cache_src,
/* We're authoritative. */ /* We're authoritative. */
if (regenerate != NULL) { if (regenerate != NULL) {
if (dirty && dirty + DIR_REGEN_SLACK_TIME < time(NULL)) { if (dirty && dirty + DIR_REGEN_SLACK_TIME < time(NULL)) {
if (regenerate()) { if (!(auth_src = regenerate())) {
log_err(LD_BUG, "Couldn't generate %s?", name); log_err(LD_BUG, "Couldn't generate %s?", name);
exit(1); exit(1);
} }
@ -1077,7 +1077,7 @@ dirserv_get_obj(const char **out,
int compress, int compress,
cached_dir_t *cache_src, cached_dir_t *cache_src,
cached_dir_t *auth_src, cached_dir_t *auth_src,
time_t dirty, int (*regenerate)(void), time_t dirty, cached_dir_t *(*regenerate)(void),
const char *name, const char *name,
int is_v1_object) int is_v1_object)
{ {
@ -1109,9 +1109,10 @@ dirserv_get_directory(void)
} }
/** /**
* Generate a fresh v1 directory (authdirservers only.) * Generate a fresh v1 directory (authdirservers only); set the_directory
* and return a pointer to the new value.
*/ */
static int static cached_dir_t *
dirserv_regenerate_directory(void) dirserv_regenerate_directory(void)
{ {
char *new_directory=NULL; char *new_directory=NULL;
@ -1120,7 +1121,7 @@ dirserv_regenerate_directory(void)
get_identity_key(), 0)) { get_identity_key(), 0)) {
log_warn(LD_BUG, "Error creating directory."); log_warn(LD_BUG, "Error creating directory.");
tor_free(new_directory); tor_free(new_directory);
return -1; return NULL;
} }
cached_dir_decref(the_directory); cached_dir_decref(the_directory);
the_directory = new_cached_dir(new_directory, time(NULL)); the_directory = new_cached_dir(new_directory, time(NULL));
@ -1135,14 +1136,14 @@ dirserv_regenerate_directory(void)
*/ */
dirserv_set_cached_directory(the_directory->dir, time(NULL), 0); dirserv_set_cached_directory(the_directory->dir, time(NULL), 0);
return 0; return the_directory;
} }
/** For authoritative directories: the current (v1) network status */ /** For authoritative directories: the current (v1) network status */
static cached_dir_t the_runningrouters = { NULL, NULL, 0, 0, 0, -1 }; static cached_dir_t the_runningrouters = { NULL, NULL, 0, 0, 0, -1 };
/** Replace the current running-routers list with a newly generated one. */ /** Replace the current running-routers list with a newly generated one. */
static int static cached_dir_t *
generate_runningrouters(void) generate_runningrouters(void)
{ {
char *s=NULL; char *s=NULL;
@ -1187,11 +1188,11 @@ generate_runningrouters(void)
set_cached_dir(&the_runningrouters, s, time(NULL)); set_cached_dir(&the_runningrouters, s, time(NULL));
runningrouters_is_dirty = 0; runningrouters_is_dirty = 0;
return 0; return &the_runningrouters;
err: err:
tor_free(s); tor_free(s);
tor_free(router_status); tor_free(router_status);
return -1; return NULL;
} }
/** Set *<b>rr</b> to the most recently generated encoded signed /** Set *<b>rr</b> to the most recently generated encoded signed
@ -1310,7 +1311,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl)
/** For authoritative directories only: replace the contents of /** For authoritative directories only: replace the contents of
* <b>the_v2_networkstatus</b> with a newly generated network status * <b>the_v2_networkstatus</b> with a newly generated network status
* object. */ * object. */
static int static cached_dir_t *
generate_v2_networkstatus(void) generate_v2_networkstatus(void)
{ {
#define LONGEST_STATUS_FLAG_NAME_LEN 7 #define LONGEST_STATUS_FLAG_NAME_LEN 7
@ -1322,7 +1323,7 @@ generate_v2_networkstatus(void)
/* second line */ \ /* second line */ \
(LONGEST_STATUS_FLAG_NAME_LEN+1)*N_STATUS_FLAGS + 2) (LONGEST_STATUS_FLAG_NAME_LEN+1)*N_STATUS_FLAGS + 2)
int r = -1; cached_dir_t *r = NULL;
size_t len, identity_pkey_len; size_t len, identity_pkey_len;
char *status = NULL, *client_versions = NULL, *server_versions = NULL, char *status = NULL, *client_versions = NULL, *server_versions = NULL,
*identity_pkey = NULL, *hostname = NULL; *identity_pkey = NULL, *hostname = NULL;
@ -1490,7 +1491,7 @@ generate_v2_networkstatus(void)
router_set_networkstatus(the_v2_networkstatus.dir, time(NULL), NS_GENERATED, router_set_networkstatus(the_v2_networkstatus.dir, time(NULL), NS_GENERATED,
NULL); NULL);
r = 0; r = &the_v2_networkstatus;
done: done:
tor_free(client_versions); tor_free(client_versions);
tor_free(server_versions); tor_free(server_versions);