taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix theoretical barrier issue

Browse Source
This commit is contained in:
Christian Grothoff 2020-01-19 15:46:09 +01:00
parent 42ef95d002
commit ca0bc6fdc1
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -436,9 +436,11 @@ free_denom_key (void *cls,
* Internal method used when the mutex is already held. * Internal method used when the mutex is already held.
* *
* @param key_state the key state to release * @param key_state the key state to release
* @param locked do we hold the lock and can check #internal_key_state
*/ */
static void static void
ks_release (struct TEH_KS_StateHandle *key_state) ks_release (struct TEH_KS_StateHandle *key_state,
int locked)
{ {
GNUNET_assert (0 < key_state->refcnt); GNUNET_assert (0 < key_state->refcnt);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@ -448,7 +450,8 @@ ks_release (struct TEH_KS_StateHandle *key_state)
key_state->refcnt--; key_state->refcnt--;
if (0 == key_state->refcnt) if (0 == key_state->refcnt)
{ {
GNUNET_assert (key_state != internal_key_state); if (locked)
GNUNET_assert (key_state != internal_key_state);
if (NULL != key_state->denomkey_map) if (NULL != key_state->denomkey_map)
{ {
GNUNET_CONTAINER_multihashmap_iterate (key_state->denomkey_map, GNUNET_CONTAINER_multihashmap_iterate (key_state->denomkey_map,
@ -1699,7 +1702,8 @@ make_fresh_key_state (struct GNUNET_TIME_Absolute now)
"Failed to load denomination keys from `%s'.\n", "Failed to load denomination keys from `%s'.\n",
TEH_exchange_directory); TEH_exchange_directory);
key_state->refcnt = 1; key_state->refcnt = 1;
ks_release (key_state); ks_release (key_state,
GNUNET_NO);
json_decref (rfc.recoup_array); json_decref (rfc.recoup_array);
json_decref (rfc.sign_keys_array); json_decref (rfc.sign_keys_array);
return NULL; return NULL;
@ -1725,7 +1729,8 @@ make_fresh_key_state (struct GNUNET_TIME_Absolute now)
"Failed to load denomination keys from `%s'.\n", "Failed to load denomination keys from `%s'.\n",
TEH_exchange_directory); TEH_exchange_directory);
key_state->refcnt = 1; key_state->refcnt = 1;
ks_release (key_state); ks_release (key_state,
GNUNET_NO);
json_decref (rfc.recoup_array); json_decref (rfc.recoup_array);
json_decref (rfc.sign_keys_array); json_decref (rfc.sign_keys_array);
return NULL; return NULL;
@ -1743,7 +1748,8 @@ make_fresh_key_state (struct GNUNET_TIME_Absolute now)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Have no signing key. Bad configuration.\n"); "Have no signing key. Bad configuration.\n");
key_state->refcnt = 1; key_state->refcnt = 1;
ks_release (key_state); ks_release (key_state,
GNUNET_NO);
destroy_response_factory (&rfc); destroy_response_factory (&rfc);
return NULL; return NULL;
} }
@ -1754,7 +1760,8 @@ make_fresh_key_state (struct GNUNET_TIME_Absolute now)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Have no denomination keys. Bad configuration.\n"); "Have no denomination keys. Bad configuration.\n");
key_state->refcnt = 1; key_state->refcnt = 1;
ks_release (key_state); ks_release (key_state,
GNUNET_NO);
destroy_response_factory (&rfc); destroy_response_factory (&rfc);
return NULL; return NULL;
} }
@ -1858,7 +1865,8 @@ make_fresh_key_state (struct GNUNET_TIME_Absolute now)
{ {
GNUNET_break (0); GNUNET_break (0);
key_state->refcnt = 1; key_state->refcnt = 1;
ks_release (key_state); ks_release (key_state,
GNUNET_NO);
destroy_response_factory (&rfc); destroy_response_factory (&rfc);
return NULL; return NULL;
} }
@ -1888,7 +1896,8 @@ TEH_KS_release_ (const char *location,
location, location,
key_state, key_state,
key_state->refcnt); key_state->refcnt);
ks_release (key_state); ks_release (key_state,
GNUNET_YES);
GNUNET_assert (0 == pthread_mutex_unlock (&internal_key_state_mutex)); GNUNET_assert (0 == pthread_mutex_unlock (&internal_key_state_mutex));
} }
@ -1919,7 +1928,8 @@ TEH_KS_acquire_ (struct GNUNET_TIME_Absolute now,
internal_key_state = NULL; internal_key_state = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"KS released in acquire due to expiration\n"); "KS released in acquire due to expiration\n");
ks_release (ks); ks_release (ks,
GNUNET_YES);
rcd = 1; /* remember that we released 'internal_key_state' */ rcd = 1; /* remember that we released 'internal_key_state' */
} }
if (NULL == internal_key_state) if (NULL == internal_key_state)