Fix deadlock in galeramon

The parameter extraction caused a recursive lock of the server
spinlock. To work around this, an unlocked version of server_get_parameter
is needed.

Ideally, a lock-free setup would be used but due to this being a bug fix,
it will have to be done later on.
This commit is contained in:
Markus Mäkelä
2018-05-11 09:00:54 +03:00
parent b776ed7821
commit 97eb7d2f9e
3 changed files with 28 additions and 15 deletions

View File

@ -957,20 +957,15 @@ static void server_parameter_free(SERVER_PARAM *tofree)
}
/**
* Retrieve a parameter value from a server
* Same as server_get_parameter but doesn't lock the server
*
* @param server The server we are looking for a parameter of
* @param name The name of the parameter we require
* @param out Buffer where value is stored, use NULL to check if the parameter exists
* @param size Size of @c out, ignored if @c out is NULL
*
* @return Length of the parameter value or 0 if parameter was not found
* @note Should only be called when the server is already locked
*/
size_t server_get_parameter(const SERVER *server, const char *name, char* out, size_t size)
size_t server_get_parameter_nolock(const SERVER *server, const char *name, char* out, size_t size)
{
int len = 0;
ss_dassert(SPINLOCK_IS_LOCKED(server->lock));
size_t len = 0;
SERVER_PARAM *param = server->parameters;
spinlock_acquire(&server->lock);
while (param)
{
@ -982,6 +977,23 @@ size_t server_get_parameter(const SERVER *server, const char *name, char* out, s
param = param->next;
}
return len;
}
/**
* Retrieve a parameter value from a server
*
* @param server The server we are looking for a parameter of
* @param name The name of the parameter we require
* @param out Buffer where value is stored, use NULL to check if the parameter exists
* @param size Size of @c out, ignored if @c out is NULL
*
* @return Length of the parameter value or 0 if parameter was not found
*/
size_t server_get_parameter(const SERVER *server, const char *name, char* out, size_t size)
{
spinlock_acquire(&server->lock);
size_t len = server_get_parameter_nolock(server, name, out, size);
spinlock_release(&server->lock);
return len;
}