Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix data race setting default_DSO_meth #16972

Closed
wants to merge 1 commit into from
Closed

Fix data race setting default_DSO_meth #16972

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 5 additions & 17 deletions crypto/dso/dso_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,10 @@
#include "dso_local.h"
#include "internal/refcount.h"

static DSO_METHOD *default_DSO_meth = NULL;

static DSO *DSO_new_method(DSO_METHOD *meth)
{
DSO *ret;

if (default_DSO_meth == NULL) {
/*
* We default to DSO_METH_openssl() which in turn defaults to
* stealing the "best available" method. Will fallback to
* DSO_METH_null() in the worst case.
*/
default_DSO_meth = DSO_METHOD_openssl();
}
ret = OPENSSL_zalloc(sizeof(*ret));
if (ret == NULL) {
ERR_raise(ERR_LIB_DSO, ERR_R_MALLOC_FAILURE);
Expand All @@ -36,7 +26,7 @@ static DSO *DSO_new_method(DSO_METHOD *meth)
OPENSSL_free(ret);
return NULL;
}
ret->meth = default_DSO_meth;
ret->meth = DSO_METHOD_openssl();
ret->references = 1;
ret->lock = CRYPTO_THREAD_lock_new();
if (ret->lock == NULL) {
Expand Down Expand Up @@ -309,9 +299,8 @@ char *DSO_convert_filename(DSO *dso, const char *filename)

int DSO_pathbyaddr(void *addr, char *path, int sz)
{
DSO_METHOD *meth = default_DSO_meth;
if (meth == NULL)
meth = DSO_METHOD_openssl();
DSO_METHOD *meth = DSO_METHOD_openssl();

if (meth->pathbyaddr == NULL) {
ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
return -1;
Expand Down Expand Up @@ -339,9 +328,8 @@ DSO *DSO_dsobyaddr(void *addr, int flags)

void *DSO_global_lookup(const char *name)
{
DSO_METHOD *meth = default_DSO_meth;
if (meth == NULL)
meth = DSO_METHOD_openssl();
DSO_METHOD *meth = DSO_METHOD_openssl();

if (meth->globallookup == NULL) {
ERR_raise(ERR_LIB_DSO, DSO_R_UNSUPPORTED);
return NULL;
Expand Down